From 183de82091431964f0722a7532db33d997ada719 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Sat, 10 Aug 2024 22:44:49 +0100
Subject: [PATCH] Add the user config and -X theirs to resolve conflicts

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a8ba166..61df43c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,9 @@ jobs:
     - name: Update release branch
       if: github.ref == 'refs/heads/main'
       run: |
+        git config --local user.email "[hidden]"
+        git config --local user.name "CI"
         git fetch origin
         git checkout -b release origin/release
-        git merge --no-ff origin/main
+        git merge origin/main -X theirs
         git push origin release
\ No newline at end of file