Differences

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

--- projects:projects [2026/06/24 09:17] – jhagstrand
+++ projects:projects [2026/09/06 02:55] (current) – [End Branch] jhagstrand
@@ Line 106: / Line 106: @@
 ====.gitignore====
-  robots.txt
-  .well-known/*
-  js.min
-  css.min
   index.php
+  min.js
+  min.css
   RELEASES.md
+  robots.txt
+  .well-known/*
   .aider*
   config.php
@@ Line 268: / Line 268: @@
   # save work
   git checkout peaceful
+  git commit -m 'feat: new feature'
   git push origin peaceful     # push feature branch to bare repo
 ==== End Branch ====
   git checkout master
-  git merge --squash peaceful
-  git commit -m 'squashed hand-written commit message'
+  #git merge --squash peaceful
-  git branch -D peaceful    # after squash the big -D force is required
+  #git commit -m 'squashed hand-written commit message'
+  #git branch -D peaceful    # after squash the big -D force is required
+  git merge --no-ff peaceful   # the commit is built-in
+  git branch -d peaceful    # after no-ff little -d id ok
   git push origin master     # push master to bare repo
   git push origin --delete peaceful  # delete feature branch from bare repo