Differences

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

--- projects:projects [2026/07/03 01:35] – [Save Work] jhagstrand
+++ projects:projects [2026/07/19 05:03] (current) – [End Branch] jhagstrand
@@ Line 273: / Line 273: @@
 ==== End Branch ====
   git checkout master
-  git merge --squash peaceful
+  #git merge --squash peaceful
+  git merge --no-ff peaceful
   git commit -m 'squashed hand-written commit message'
   git branch -D peaceful    # after squash the big -D force is required