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

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

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index de7e7ff..6568ca2 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 theirs
+            git rebase origin/master --strategy-option ours
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index b51fe02..fb9ef28 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -44,7 +44,7 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option theirs
+              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'