workflow: do not use squashed merging

2025-03-23 18:45:12 +01:00 · 2025-03-23 18:45:12 +01:00 · e2fa915bdd
commit e2fa915bdd
parent 9cfe01d3e4
1 changed files with 1 additions and 2 deletions
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@ -34,8 +34,7 @@ jobs:
            if [ $commits_ahead -ne 0 ]
            then
              git fetch origin
-              git merge -X theirs --squash origin/main
-              git commit -m "Merge main branch squashed $(date -I)"
+              git merge -m "Merge main branch $(date -I)" -X theirs origin/main
            else
              echo "Merge not necessary"
            fi