Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Table of Contents

...

Next can be force pushed with approval from the Repo Czar.

Post-cime merging

Moved to /wiki/spaces/SE/pages/36176429

Processing a bug

If you've been assigned to a bug, follow these steps:

...

A fork is nothing more than a developers personal clone of E3SM-Project/E3SM that is hosted on github. A fork will be usually be created under a user account, as opposed to although an organization can also create a fork. A fork of ACMEE3SM-ClimateProject/ACME E3SM will result in a repository named username/E3SM (e.g. douglasjacobsen/E3SM).

...

To integrate a branch from a fork to the E3SM master, you need  to gain access to the fork's branches.  To do this you need to add a new remote to your local repository that points to the developer's fork. For example:

git remote add username/E3SM git@github.com:username/E3SM.git

use "git remote -v" to see the remotes your clone is tracking.

While replacing username with the developers actual github username will add a new remote to your local repository named username/E3SM. Once the remote is added, you can update pull down that remote's remote tracking branches using:

...