From 23b23432b5dbf4bd7bfd8a3d8c9cde4076649cfe Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Oct 2023 00:35:40 +0100
Subject: [PATCH] more

---
 .gitea/workflows/convert-to-yml.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 31559b2..9450a31 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -34,6 +34,9 @@ jobs:
           git add -A
           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 push origin HEAD:${{ env.PRODUCTION_BRANCH }}
       - name: make pull request
         run: |
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea