User Tools

Site Tools


evergreen-docs:github-workflow

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
Next revisionBoth sides next revision
evergreen-docs:github-workflow [2021/07/22 14:32] – adding some missing steps sandbergjaevergreen-docs:github-workflow [2022/02/10 13:34] – external edit 127.0.0.1
Line 12: Line 12:
   - Cherry pick the relevant commits into your local copy of the master branch.   - Cherry pick the relevant commits into your local copy of the master branch.
     - If only one commit: ''git cherry-pick -s [BRANCHNAME]''     - 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   - Test build the changed AsciiDoc file + the nav.adoc file(s) that include it
     - ''%%perl ./generate_docs.pl --base-url http://examplesite.org/prod%%''     - ''%%perl ./generate_docs.pl --base-url http://examplesite.org/prod%%''
evergreen-docs/github-workflow.txt · Last modified: 2023/12/28 15:54 by aneiman

Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
CC Attribution-Share Alike 4.0 International Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki

© 2008-2022 GPLS and others. Evergreen is open source software, freely licensed under GNU GPLv2 or later.
The Evergreen Project is a U.S. 501(c)3 non-profit organization.