evergreen-docs:github-workflow
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
evergreen-docs:github-workflow [2023/12/28 15:34] – aneiman | evergreen-docs:github-workflow [2023/12/28 15:54] (current) – aneiman | ||
---|---|---|---|
Line 32: | Line 32: | ||
- The '' | - The '' | ||
- If you need to squash commits: | - If you need to squash commits: | ||
- | - Verify that you are in your local branch. | + | - From your local branch, |
- | - If your branch is already built on current main, you can use: '' | + | |
- 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 2] [COMMIT MESSAGE 2] | + | - '' |
- | - Change the word "pick" | + | - Change the word '' |
- | - squash --> | + | |
- | - fixup --> merges commits like squash does, but discards previous | + | |
- Check gitlog to ensure that you now have a single commit | - Check gitlog to ensure that you now have a single commit | ||
- Make any corrections (via additional commits, if needed) | - Make any corrections (via additional commits, if needed) |
evergreen-docs/github-workflow.1703795652.txt.gz · Last modified: 2023/12/28 15:34 by aneiman