xxtheres

.gitea/workflows/build->develop.yml

@@ -46,7 +46,7 @@ jobs:
             echo rebasing with master
             git log -5
             git status
-            git rebase origin/master --strategy-option ours
+            git rebase -Xtheirs origin/master #--strategy-option ours
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;