workflow: fix merge conflict failing script

2025-03-22 08:44:58 +01:00 · 2025-03-22 08:44:58 +01:00 · a2a3d2586c
commit a2a3d2586c
parent 2ac3af7a53
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@ -34,7 +34,7 @@ jobs:
            if [ $commits_ahead -ne 0 ]
            then
              git fetch origin
-              git merge --squash origin/main
+              git merge --squash origin/main || true # do not exit script on merge conflict
              git push --force-with-lease

              # solve potential merge conflict by taking flake.lock from main