From 8d9892e958e72dbf16fef0e20a98222bf4f0d031 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 22 Mar 2025 09:03:05 +0100
Subject: [PATCH] workflow: Simplify automatic merge conflict solving

---
 .gitea/workflows/update-flake.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index 0ca4103..47a227a 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -34,12 +34,7 @@ jobs:
             if [ $commits_ahead -ne 0 ]
             then
               git fetch origin
-              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 --theirs flake.lock
-              git add flake.lock
-
+              git merge -X theirs --squash origin/main
               git commit -m "Merge main branch squashed $(date -I)"
             else
               echo "Merge not necessary"