diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml index 0f73f09..0ca4103 100644 --- a/.gitea/workflows/update-flake.yaml +++ b/.gitea/workflows/update-flake.yaml @@ -37,7 +37,9 @@ jobs: git merge --squash origin/main || true # do not exit script on merge conflict # solve potential merge conflict by taking flake.lock from main - git checkout origin/main -- flake.lock + git checkout --theirs flake.lock + git add flake.lock + git commit -m "Merge main branch squashed $(date -I)" else echo "Merge not necessary"