diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 053a47c..daf7449 100644 --- 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 }};