evergreen-docs:github-workflow
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
evergreen-docs:github-workflow [2023/12/28 15:22] – aneiman | evergreen-docs:github-workflow [2023/12/28 15:51] – aneiman | ||
---|---|---|---|
Line 31: | Line 31: | ||
- If more than one: '' | - If more than one: '' | ||
- The '' | - The '' | ||
- | | + | |
- | - 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 1] [COMMIT MESSAGE 1] | + | - pick [COMMIT HASH 2] [COMMIT MESSAGE 2] |
- | - pick [COMMIT HASH 2] [COMMIT MESSAGE 2] | + | - Change the word " |
- | - Change the word " | + | - squash --> merges commits, then allows amendment of commit message |
- | - squash --> merges commits, then allows amendment of commit message | + | - fixup --> merges commits like squash does, but discards previous commit message |
- | - fixup --> merges commits like squash does, but discards previous commit message | + | - Check gitlog to ensure that you now have a single |
- | - Push the commit | + | |
- | - '' | + | |
- Make any corrections (via additional commits, if needed) | - Make any corrections (via additional commits, if needed) | ||
- Use '' | - Use '' |
evergreen-docs/github-workflow.txt · Last modified: 2023/12/28 15:54 by aneiman