Differences

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

--- evergreen-docs:github-workflow [2023/12/28 15:22] – aneiman
+++ evergreen-docs:github-workflow [2023/12/28 15:54] (current) – aneiman
@@ Line 31: / Line 31: @@
     - If more than one: ''%%git cherry-pick -s [BRANCHNAME]~[Number of commits]..[BRANCHNAME] --edit%%'' (for example, if you are bringing in two commits from the survey-docs branch, run ''%%git cherry-pick survey-docs~2..survey-docs) --edit%%''
       - The ''%%--edit%%'' flag will permit you to edit all commit messages as they come in.
-    - 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 main, you 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]
+      - ''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. This merges the commits and retains the first line's commit message.
-      - Change the word "pick" in the second line to "fixup" then save and close the file
+    - Check gitlog to ensure that you now have a single commit
-        - squash --> merges commits, then allows amendment of commit message
-        - fixup --> merges commits like squash does, but discards previous commit message
-      - Push the commit again, and force it to overwrite the previous commits:
-        - ''git push <nowiki>--force</nowiki> working [BRANCHNAME]:user/[USER]/[BRANCHNAME]''
   - Make any corrections (via additional commits, if needed)
   - Use ''git log'' to make sure everything looks good.