workflow: use --force-with-lease instead of -f
This commit is contained in:
parent
8c4baf7a73
commit
01742a8088
@ -16,7 +16,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: flake-updates
|
ref: flake-updates
|
||||||
|
|
||||||
- name: Fetch latest changes and reset branch
|
- name: Fetch latest changes and rebase
|
||||||
run: |
|
run: |
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git rebase origin/main
|
git rebase origin/main
|
||||||
@ -37,5 +37,5 @@ jobs:
|
|||||||
echo "No changes to commit."
|
echo "No changes to commit."
|
||||||
else
|
else
|
||||||
git commit -m "Update flake.lock $(date -I)"
|
git commit -m "Update flake.lock $(date -I)"
|
||||||
git push -f origin flake-updates
|
git push --force-with-lease origin flake-updates
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user