Differences

This shows you the differences between two versions of the page.

--- evergreen-docs:github-workflow [2023/12/28 15:51] – aneiman
+++ evergreen-docs:github-workflow [2023/12/28 15:54] (current) – aneiman
@@ Line 34: / Line 34: @@
     - From your local branch, enter ''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:
-      - 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 "pick" in the second line to "fixup" then save and close the file
+    - Change the word ''pick'' in the second line to ''fixup'' then save and close the file. This merges the commits and retains the first line's commit message.
-      - squash --> merges commits, then allows amendment of commit message
-      - fixup --> merges commits like squash does, but discards previous commit message
     - Check gitlog to ensure that you now have a single commit
   - Make any corrections (via additional commits, if needed)