From c8455a939bbc50d3d7d814421d8ea5651b0b3f9a Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 18:10:02 +0100
Subject: [PATCH] ..

---
 .gitea/workflows/build->develop.yml   | 3 ++-
 .gitea/workflows/develop -> build.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 87c6d53..053a47c 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-option ours
+            git rebase -Xtheirs origin/master
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
@@ -59,6 +59,7 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
+              #git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
               git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
               git -C ../cloned fetch origin #--depth=1
               git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index 83ddfe8..f11810d 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -43,6 +43,7 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
+              #git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
               git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
               git -C ../cloned fetch origin #--depth=1
               git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH