From e2b24a9dab3bf017dc17cc1cdadc86111d568cbf Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 16:03:44 +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 4c1a328..de7e7ff 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -59,7 +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 origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option theirs
+              git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours
               git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'