github branch, merge process

Note on branch

main branch

pull request from other branches when tagged as version. currently main branch support only serial version of the code.

develop branch

Working version branched off from main branch. This branch is usually merged into main when it is released as version.

cesm-coupling branch

MPI parallell version roughly follow the same capability as main branch. Now act as main branch for parallel version. Once compilation without MPI library (serial code compilation) function, this will replace main branch.

Note on pull-request

Merging branches in ESCOMP require pull-request. No direct merge by git push is allowed (it is blocked)

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).