diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml index 096c3c6..0f73f09 100644 --- a/.gitea/workflows/update-flake.yaml +++ b/.gitea/workflows/update-flake.yaml @@ -35,7 +35,6 @@ jobs: then git fetch origin 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 git checkout origin/main -- flake.lock