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

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

diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index fb9ef28..b51fe02 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 ours
+              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option theirs
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'