build/rebase-14 -> develop/rebase-14

...
2023-10-23 15:19:54 +00:00 · 2023-10-23 15:19:54 +00:00 · 2023-10-23 15:19:54 +00:00 · 2023-10-23 15:19:54 +00:00 · 2023-10-23 15:19:54 +00:00 · 2023-10-23 15:19:54 +00:00
1 changed files with 2 additions and 2 deletions
--- 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 }};
@ -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'
Author	SHA1	Message	Date
giles	8a4d8b6bc8	build/rebase-14 -> develop/rebase-14 build-develop-branch / build-branch (push) Failing after 29s Details	2023-10-23 15:19:54 +00:00
gilesb	a051369401	...	2023-10-23 15:19:54 +00:00
gilesb	7ea2a34e80	...	2023-10-23 15:19:54 +00:00
gilesb	593f334b3f	...	2023-10-23 15:19:54 +00:00
gilesb	a930ee8a60	hhh	2023-10-23 15:19:54 +00:00
gilesb	6c47b2db75	...	2023-10-23 15:19:54 +00:00