diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index b100bf3..9e4a794 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -45,9 +45,11 @@ jobs: if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then ls git log -5 + git status git rebase origin/master --strategy-option=ours ls git log -5 + git status 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;