...
convert-to-yml / develop-branch (push) Failing after 32s Details

This commit is contained in:
gilesb 2023-10-23 18:24:50 +01:00
parent 6b0114fbc9
commit a7364a2a38
1 changed files with 1 additions and 1 deletions

View File

@ -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 }};