diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 6568ca2..0fde989 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 origin/master --strategy-option ours + git rebase origin/master --strategy-option ours --force-rebase git log -5 echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; @@ -59,7 +59,7 @@ jobs: echo 'pushed new branch and created pr'; else if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then - git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours + git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; else echo 'no changes so no push' diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 9489f4e..832e8ed 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -43,7 +43,7 @@ jobs: git push origin HEAD:${{ env.BUILD_BRANCH }}; else if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then - git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours + git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours --force-rebase git push origin HEAD:${{ env.BUILD_BRANCH }} else echo 'no changes so no push'