rebase27
This commit is contained in:
parent
a3aeef2f0d
commit
b4c50e923f
|
@ -44,7 +44,7 @@ jobs:
|
|||
run: |
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
ls
|
||||
git rebase -Xtheirs origin/master
|
||||
git rebase -Xours origin/master
|
||||
ls
|
||||
git log -5
|
||||
echo no development branch so pushing
|
||||
|
|
Loading…
Reference in New Issue