rebase31
This commit is contained in:
parent
2c9853613b
commit
e4e5fa3bb7
|
@ -44,11 +44,11 @@ jobs:
|
|||
run: |
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
ls
|
||||
git log -5
|
||||
git log -20
|
||||
git status
|
||||
git rebase origin/master --strategy-option=ours
|
||||
ls
|
||||
git log -5
|
||||
git log -20
|
||||
git status
|
||||
echo no development branch so pushing
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
|
|
Loading…
Reference in New Issue