From c8fcc966771fa5862e039fa0d154798bd9d727fc Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 17:43:06 +0100
Subject: [PATCH] xxtheres

---
 .gitea/workflows/build->develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 0ce1ab9..578dd61 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -46,7 +46,7 @@ jobs:
             echo rebasing with master
             git log -5
             git status
-            git rebase origin/master --strategy-option ours
+            git rebase -Xtheirs origin/master #--strategy-option ours
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;