From 3758f2a0c2631eecec7bb137cdb4297112a7bfab Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Fri, 9 Dec 2016 14:51:31 -0500 Subject: [PATCH] NO-JIRA: script to merge 1.x --- scripts/merge-PR.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh index dc42761a14..99623bd85f 100755 --- a/scripts/merge-PR.sh +++ b/scripts/merge-PR.sh @@ -39,9 +39,9 @@ git fetch $ARTEMIS_USER_REMOTE_NAME git fetch $ARTEMIS_APACHE_REMOTE_NAME git fetch $ARTEMIS_GITHUB_REMOTE_NAME -git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master +git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B master git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1 -git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master -git checkout master +git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x +git checkout 1.x git merge --no-ff $1 -m "This closes #$*" git branch -D $1