build/rebase-13 -> develop/rebase-13

...
2023-10-23 15:07:21 +00:00 · 2023-10-23 15:07:21 +00:00 · 2023-10-23 15:07:21 +00:00 · 2023-10-23 15:07:21 +00:00 · 2023-10-23 15:07:21 +00:00
2 changed files with 3 additions and 3 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'
--- a/.gitea/workflows/develop
+++ b/.gitea/workflows/develop
@ -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 theirs
+              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
              git push origin HEAD:${{ env.BUILD_BRANCH }}
            else
              echo 'no changes so no push'
Author	SHA1	Message	Date
giles	3d606bff68	build/rebase-13 -> develop/rebase-13 build-develop-branch / build-branch (push) Failing after 28s Details build-develop-branch / delete (pull_request) Successful in 14s Details build-develop-branch / if_merged (pull_request) Has been skipped Details	2023-10-23 15:07:21 +00:00
gilesb	fa777e887e	...	2023-10-23 15:07:21 +00:00
gilesb	e2b24a9dab	...	2023-10-23 15:07:21 +00:00
gilesb	3f3ada6b26	hhh	2023-10-23 15:07:21 +00:00
gilesb	1831552c8a	.......	2023-10-23 15:07:21 +00:00