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

workflow: fix merge conflict failing script

Browse Source
This commit is contained in:
Julian Mutter
2025-03-22 08:44:58 +01:00
parent 2ac3af7a53
commit a2a3d2586c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +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 git merge --squash origin/main || true # do not exit script on merge conflict
git push --force-with-lease 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