diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml index 682557e..04475bd 100644 --- a/.gitea/workflows/update-flake.yaml +++ b/.gitea/workflows/update-flake.yaml @@ -18,8 +18,7 @@ jobs: - name: Fetch latest changes and reset branch run: | - git fetch origin main - git status + git fetch origin git rebase origin/main - name: Set up Nix @@ -38,5 +37,5 @@ jobs: echo "No changes to commit." else git commit -m "Update flake.lock $(date -I)" - git push origin flake-updates + git push -f origin flake-updates fi