Differences

This shows you the differences between two versions of the page.

--- evergreen-docs:github-workflow [2021/05/28 18:35] – small syntax fix sandbergja
+++ evergreen-docs:github-workflow [2021/07/29 11:51] – aneiman
@@ Line 12: / Line 12: @@
   - Cherry pick the relevant commits into your local copy of the master branch.
     - If only one commit: ''git cherry-pick -s [BRANCHNAME]''
-    - If more than one: ''git cherry-pick -s [BRANCHNAME]~[Number of commits]..[BRANCHNAME]'' (for example, if you are bringing in two commits from the survey-docs branch, run ''git cherry-pick survey-docs~2..survey-docs)''
+    - If more than one: ''%%git cherry-pick -s [BRANCHNAME]~[Number of commits]..[BRANCHNAME] --edit%%'' (for example, if you are bringing in two commits from the survey-docs branch, run ''%%git cherry-pick survey-docs~2..survey-docs) --edit%%''
+      - The ''%%--edit%%'' flag will permit you to edit all commit messages as they come in.
   - Test build the changed AsciiDoc file + the nav.adoc file(s) that include it
     - ''%%perl ./generate_docs.pl --base-url http://examplesite.org/prod%%''
@@ Line 25: / Line 26: @@
   - When you are confident your local master branch is ready: ''git push origin master''
   - Backport to previous EG versions as appropriate
-    - ''git checkout rel_3_8''
+    - ''git checkout rel_3_8'' (where rel_3_8 is the branch for previous version)
+    - ''git pull'' (to get the most up-to-date version of the branch)
     - If one commit: ''git cherry-pick master''
     - If more than one: ''git cherry-pick master~[Number of commits]..master''
+    - ''git push''
   - Go back to the pull request on Github's site.  Comment on the pull request to thank the contributor, then close the pull request.