From 19b3ad9da5f215ae732d488ed709053f3a4f3ec4 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Fri, 24 Feb 2017 16:05:55 -0500 Subject: [PATCH] NO-JIRA fixing merge script on 1.x --- scripts/merge-PR.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh index 99623bd85f..df4470f182 100755 --- a/scripts/merge-PR.sh +++ b/scripts/merge-PR.sh @@ -39,7 +39,7 @@ git fetch $ARTEMIS_USER_REMOTE_NAME git fetch $ARTEMIS_APACHE_REMOTE_NAME git fetch $ARTEMIS_GITHUB_REMOTE_NAME -git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B master +git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B 1.x git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1 git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x git checkout 1.x