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

Workflow: automatically solve merge conflict

Browse Source
This commit is contained in:
Julian Mutter
2025-03-22 08:58:58 +01:00
parent 3801bbda11
commit 489b839452
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,9 @@ jobs:
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
# 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 --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"