Differences

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

--- evergreen-docs:github-workflow [2021/07/22 14:32] – adding some missing steps sandbergja
+++ evergreen-docs:github-workflow [2021/07/29 11:47] – 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%%''