remove unnecessary git push
This commit is contained in:
parent
a2a3d2586c
commit
3801bbda11
@ -35,7 +35,6 @@ jobs:
|
|||||||
then
|
then
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git merge --squash origin/main || true # do not exit script on merge conflict
|
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
|
# solve potential merge conflict by taking flake.lock from main
|
||||||
git checkout origin/main -- flake.lock
|
git checkout origin/main -- flake.lock
|
||||||
|
Loading…
x
Reference in New Issue
Block a user