...

2023-10-23 18:24:50 +01:00 · 2023-10-23 18:24:50 +01:00 · a7364a2a38
parent 6b0114fbc9
commit a7364a2a38
1 changed files with 1 additions and 1 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 -Xtheirs origin/master
+            git rebase -Xours origin/master
            git log -5
            echo no development branch so pushing
            git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};