From 595a9761d0505149f4358062c1cf8af6a2dfe20c Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sat, 22 Mar 2025 08:05:24 +0100 Subject: [PATCH] workflow: use --force-with-lease instead of -f --- .gitea/workflows/update-flake.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml index 04475bd..0f6bc1e 100644 --- a/.gitea/workflows/update-flake.yaml +++ b/.gitea/workflows/update-flake.yaml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 ref: flake-updates - - name: Fetch latest changes and reset branch + - name: Fetch latest changes and rebase run: | git fetch origin git rebase origin/main @@ -37,5 +37,5 @@ jobs: echo "No changes to commit." else git commit -m "Update flake.lock $(date -I)" - git push -f origin flake-updates + git push --force-with-lease origin flake-updates fi