From e68b888907e3f24504da490eeafd6a898b5b09cc Mon Sep 17 00:00:00 2001 From: Paul Maddox Date: Mon, 28 Oct 2019 15:30:52 -0700 Subject: [PATCH] Update create-pull-request.sh --- generate/create-pull-request.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate/create-pull-request.sh b/generate/create-pull-request.sh index 8c22ffbd40..6b4a66e370 100755 --- a/generate/create-pull-request.sh +++ b/generate/create-pull-request.sh @@ -58,6 +58,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) REQUEST_BRANCH="aws-goformation-updates" echo "Creating new branch: ${REQUEST_BRANCH} tracking origin/${SRC_BRANCH}" git checkout -b ${REQUEST_BRANCH} origin/${SRC_BRANCH} +git pull --rebase origin ${REQUEST_BRANCH} || true # Merging in any changes from upstream git remote add upstream https://github.com/${DST_REPO}.git @@ -86,7 +87,6 @@ git commit -m "${COMMIT_MSG}" echo "Pushing changes..." git remote add origin-push https://${GITHUB_TOKEN}@github.com/${SRC_REPO}.git > /dev/null 2>&1 -git pull --rebase origin ${REQUEST_BRANCH} || true git push --quiet --set-upstream origin-push ${REQUEST_BRANCH} sleep 10