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 revision Previous revision
evergreen-docs:github-workflow [2021/07/29 11:47]
aneiman
evergreen-docs:github-workflow [2021/07/29 11:51] (current)
aneiman
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] --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''​ +    - 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.+      - 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: 2021/07/29 11:51 by aneiman

© 2008-2017 GPLS and others. Evergreen is open source software, freely licensed under GNU GPLv2 or later.
The Evergreen Project is a member of Software Freedom Conservancy.