Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: note file conflicts in merge commit message.

...

Code Block
Merge branch <branchname> (PR#10)      !! Add the PR # to the automatically generated title.

(Be sure to add a blank after above title)
(copy and paste the original description from the PR)

(copy and paste the testing description in the PR and add info on any more testing done prior to merging)
 
Fixes #XY, Fixes #MN  (For commit to master only, include Github issue numbers for the bugs this commit fixes.  Be sure to use the word "Fixes" 
									before each # to close the associated bugs)
 
[non-BFB] or [CC]    !!  Add ONE of these keys to indicate if this will affect model results to roundoff [non-BFB] 
					 !!  or climate changing [CC].  If neither is present, commit is assumed to be bit-for-bit.
 
LG-92 (if there are also JIRA issue numbers, add those below github issues and BFB keys.)
 
(If the merge produces merge conflicts, the list of files that were in conflict should be left in the message.)