-
Notifications
You must be signed in to change notification settings - Fork 62
github branch, merge process
MPI parallel version. pull request from other branches for merging and tagged as version from this branch. cesm-coupling branch was copied to this in July 2 2025, for further development
previous main branch was renamed to this on July 2nd 2025, and locked since then.
This branch was copied to main on July 2nd 2025, and cesm-coupling has been locked (no more changes allowed).
see how to rename a branch in git
Merging branches in ESCOMP require pull-request. No direct merge by git push is allowed (it is blocked)
Current practice:
Just pull-request a working branch in personal git repository to main branch.
Previous practice:
Use develop branch. Pull-request a working branch in personal git repository to develop branch, and when develop branch is ready to be tagged, pull-request ESCOMP/develop to ESCOMP/main at remote git repository, add adequate notes (see example of previous pull-request). The title of pull-request is version name. Then perform merge (no squash, no rebase, so include merge commit).