julian/hydra-jobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workflow: Simplify automatic merge conflict solving

Browse Source
This commit is contained in:
Julian Mutter 2025-03-22 09:03:05 +01:00
parent 489b839452
commit 8d9892e958
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitea/workflows/update-flake.yaml
View File

@ -34,12 +34,7 @@ jobs:
if [ $commits_ahead -ne 0 ] if [ $commits_ahead -ne 0 ]
then then
git fetch origin git fetch origin
git merge --squash origin/main || true # do not exit script on merge conflict git merge -X theirs --squash origin/main
# solve potential merge conflict by taking flake.lock from main
git checkout --theirs flake.lock
git add flake.lock
git commit -m "Merge main branch squashed $(date -I)" git commit -m "Merge main branch squashed $(date -I)"
else else
echo "Merge not necessary" echo "Merge not necessary"