This commit is contained in:
gilesb 2023-10-23 17:37:17 +01:00 committed by giles
parent 8504eb1655
commit 7ba33a3122
1 changed files with 1 additions and 0 deletions

View File

@ -43,6 +43,7 @@ jobs:
- name: push
run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
echo rebasing with master
git rebase origin/master --strategy-option ours
git log -5
echo no development branch so pushing