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 revisionBoth sides next revision
evergreen-docs:github-workflow [2021/05/28 18:35] – small syntax fix sandbergjaevergreen-docs:github-workflow [2021/07/22 14:32] – adding some missing steps sandbergja
Line 25: Line 25:
   - When you are confident your local master branch is ready: ''git push origin master''   - When you are confident your local master branch is ready: ''git push origin master''
   - Backport to previous EG versions as appropriate   - 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 one commit: ''git cherry-pick master''
     - If more than one: ''git cherry-pick master~[Number of commits]..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.   - Go back to the pull request on Github's site.  Comment on the pull request to thank the contributor, then close the pull request.
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.