Merge main branch squashed 2025-03-22

.gitea/workflows/update-flake.yaml

@@ -30,13 +30,14 @@ jobs:
             git log --oneline -5
             echo "----------"
             git log --oneline -5 origin/main
-            echo .
 
             if [ $commits_ahead -ne 0 ]
             then
-              git rebase -X theirs origin/main
+              git fetch origin
+              git merge -X theirs --squash origin/main
+              git commit -m "Merge main branch squashed $(date -I)"
             else
-              echo "Rebase not necessary"
+              echo "Merge not necessary"
             fi
 
       - name: Set up Nix
@@ -53,4 +54,4 @@ jobs:
           git diff --cached --quiet && echo "No changes to commit." && exit 0
 
           git commit -m "Update flake.lock $(date -I)"
-          git push --force-with-lease origin flake-updates
+          git push origin flake-updates