From 32591f937a0e94ef1a4fa0b4a7947393be8a3c11 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Oct 2023 00:37:59 +0100
Subject: [PATCH] more

---
 .gitea/workflows/convert-to-yml.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 9450a31..989a9ac 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -35,7 +35,7 @@ jobs:
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
           git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
           git fetch
-          git merge origin/master --allow-unrelated-histories 
+          git merge origin/master --allow-unrelated-histories --strategy-option=ours
           git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
       - name: make pull request
         run: |