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
Last revisionBoth sides next revision
evergreen-docs:github-workflow [2023/12/28 15:34] aneimanevergreen-docs:github-workflow [2023/12/28 15:51] aneiman
Line 32: Line 32:
       - 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.
   - If you need to squash commits:   - If you need to squash commits:
-    - Verify that you are in your local branch+    - From your local branch, enter ''git rebase -i HEAD~2'' (where 2 is the number of commits you wish to combine)    
-    - If your branch is already built on current mainyou can use: ''git rebase -i HEAD~2'' (where 2 is the number of commits you wish to combine)    +
     - Your text editor will open and should show both of the commits, for example:     - Your text editor will open and should show both of the commits, for example:
       - pick [COMMIT HASH 1] [COMMIT MESSAGE 1]       - pick [COMMIT HASH 1] [COMMIT MESSAGE 1]
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.