Differences

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

--- projects:projects [2026/06/23 20:52] – [Deploy] jhagstrand
+++ projects:projects [2026/07/19 05:03] (current) – [End Branch] jhagstrand
@@ Line 24: / Line 24: @@
 [[projects:homepage:homepage]] - homepage for voyc.com
+[[projects:library:library]] - library of web development components
 [[projects:pokerface:pokerface]] - facial expressions of artificial feelings
@@ Line 104: / 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 266: / 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 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
@@ Line 278: / Line 282: @@
 ==== Deploy ====
-  git -a tag v0.2.0 -m'...'  # with -a and not -m the editor opens for multiline message
+  # in local dev
+  git tag -a v0.2.0  # with -a and not -m the editor opens for multiline message
   git push origin master --tags
-  git push gitlab master --tags
+  git push gitlab master --tags  # need PAT
+  git for-each-ref --sort=-version:refname --format='%(refname:short)  %(contents)%0a%0a' refs/tags >RELEASES.md
   # in production webserver
   git fetch origin
   git reset --hard origin/master
-  git push gitlab master --tags
-  scripts/print-releases.sh   # generate RELEASES.md
-  git for-each-ref --sort=-version:refname --format='%(refname:short)  %(contents)%0a%0a' refs/tags >RELEASES.md