rebase28

.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 -Xours origin/master
+            git rebase origin/master --strategy-option=ours
             ls
             git log -5
             echo no development branch so pushing