If the branch already exists, don't create it again.

master
Simon Quigley 5 years ago
parent a8aec7fc37
commit 17e3f7dc47

@ -56,10 +56,10 @@
<command> <command>
cd {{ NAME }} cd {{ NAME }}
git checkout {{ DEFAULT_BRANCH }} git checkout {{ DEFAULT_BRANCH }}
git checkout -b {{ PACKAGING_BRANCH_S }} || git checkout {{ PACKAGING_BRANCH_S }} git branch -a | egrep "remotes/origin/{{ PACKAGING_BRANCH_S }}" && git checkout {{ PACKAGING_BRANCH_S }} || git checkout -b {{ PACKAGING_BRANCH_S }}
git merge --ff-only {{ DEFAULT_BRANCH }} git merge --ff-only {{ DEFAULT_BRANCH }}
git push --set-upstream origin {{ PACKAGING_BRANCH_S }} git push --set-upstream origin {{ PACKAGING_BRANCH_S }}
git checkout -b {{ PACKAGING_BRANCH_U }} || git checkout {{ PACKAGING_BRANCH_U }} git branch -a | egrep "remotes/origin/{{ PACKAGING_BRANCH_U }}" && git checkout {{ PACKAGING_BRANCH_U }} || git checkout -b {{ PACKAGING_BRANCH_U }}
git merge --ff-only {{ PACKAGING_BRANCH_S }} git merge --ff-only {{ PACKAGING_BRANCH_S }}
git push --set-upstream origin {{ PACKAGING_BRANCH_U }} git push --set-upstream origin {{ PACKAGING_BRANCH_U }}
</command> </command>

Loading…
Cancel
Save