From 489b8394526b570fb781679a6ea9559de3de38c9 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sat, 22 Mar 2025 08:58:58 +0100 Subject: [PATCH] Workflow: automatically solve merge conflict --- .gitea/workflows/update-flake.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml index 0f73f09..0ca4103 100644 --- a/.gitea/workflows/update-flake.yaml +++ b/.gitea/workflows/update-flake.yaml @@ -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"