Add the user config and -X theirs to resolve conflicts

.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