diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 1f13683..2f36d58 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -44,11 +44,11 @@ jobs: run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then ls - git log -20 + git log -5 git status - git rebase origin/master --strategy-option=ours + git rebase origin/master --strategy-option=theirs ls - git log -20 + git log -4 git status echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};