From 78e6bbc80f8007b2592dd8a8fea43331c5438963 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Oct 2023 10:30:27 +0100
Subject: [PATCH] hopefully this will sort it

---
 .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 f1d8a0e..ddcc618 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -33,7 +33,7 @@ jobs:
           git commit -m "${{ env.CI_COMMIT_MESSAGE }}
           
           converted from batch"
-          git merge origin/master --strategy-option=ours
+          git merge origin/master --strategy-option=ours --allow-unrelated
           git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
 
       - name: GIT commit and push all changed files