.....

.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 ours
+            git rebase origin/master --strategy theirs
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};