Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA fixing merge script on 1.x

This commit is contained in:
Clebert Suconic 2017-02-24 16:05:55 -05:00
parent 2f68737b3f
commit 19b3ad9da5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/merge-PR.sh
View File

@ -39,7 +39,7 @@ git fetch $ARTEMIS_USER_REMOTE_NAME
git fetch $ARTEMIS_APACHE_REMOTE_NAME git fetch $ARTEMIS_APACHE_REMOTE_NAME
git fetch $ARTEMIS_GITHUB_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 checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x
git checkout 1.x git checkout 1.x