diff --git a/templates/merger.xml b/templates/merger.xml index 03f2176..adfdc53 100644 --- a/templates/merger.xml +++ b/templates/merger.xml @@ -53,9 +53,9 @@ cd {{ NAME }} git checkout {{ DEFAULT_BRANCH }} -git checkout {{ PACKAGING_BRANCH }} +git checkout -b {{ PACKAGING_BRANCH }} || git checkout {{ PACKAGING_BRANCH }} git merge --ff-only {{ DEFAULT_BRANCH }} -git push origin {{ PACKAGING_BRANCH }} +git push --set-upstream origin {{ PACKAGING_BRANCH }}