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

---
 .gitea/workflows/develop -> build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index b51fe02..9489f4e 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -34,8 +34,7 @@ jobs:
           echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
       - name: status
         run: |
-          git branch -r
-          echo $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c)
+          ls
       - name: push
         run: |
           git add -A
@@ -44,7 +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 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'