rebase27

2023-10-23 18:31:05 +01:00 · 2023-10-23 18:31:05 +01:00 · debdaaca6f
parent 091daa2218
commit debdaaca6f
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@ -44,7 +44,7 @@ jobs:
        run: |
          if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
            ls
-            git rebase -Xtheirs origin/master
+            git rebase -Xours origin/master
            ls
            git log -5
            echo no development branch so pushing