NO-JIRA fixing merge script on 1.x
This commit is contained in:
parent
2f68737b3f
commit
19b3ad9da5
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue