Workflow: automatically solve merge conflict
This commit is contained in:
@ -37,7 +37,9 @@ jobs:
|
||||
git merge --squash origin/main || true # do not exit script on merge conflict
|
||||
|
||||
# solve potential merge conflict by taking flake.lock from main
|
||||
git checkout origin/main -- flake.lock
|
||||
git checkout --theirs flake.lock
|
||||
git add flake.lock
|
||||
|
||||
git commit -m "Merge main branch squashed $(date -I)"
|
||||
else
|
||||
echo "Merge not necessary"
|
||||
|
Reference in New Issue
Block a user