.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 origin/master --strategy-option theirs
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
@@ -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 ours
+              git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option theirs
               git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'

.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'