From b2f8610a035fadea067168aef62b7f6faea154bc Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 15:49:53 +0100
Subject: [PATCH] .....

---
 .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 c65694a..e2b87d1 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -43,7 +43,7 @@ jobs:
       - name: push
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git rebase origin/master --strategy ours
+            git rebase origin/master --strategy theirs
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};