From ebd0aa809fac07cc0dedd854d81a5fb11a00e10b Mon Sep 17 00:00:00 2001 From: Jeen Broekstra Date: Fri, 13 Mar 2020 13:07:54 +1100 Subject: [PATCH] GH-1995 target develop branch for sync PR - added PR body message reminding to use merge commit --- release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.sh b/release.sh index 06e337780f6..a487b911e16 100755 --- a/release.sh +++ b/release.sh @@ -155,7 +155,7 @@ read -n 1 -s -r -p "Press any key to continue (ctrl+c to cancel)"; printf "\n\n" echo ""; echo "Creating pull request to merge release branch back into master" -hub pull-request -f -m "next development iteration: ${MVN_NEXT_SNAPSHOT_VERSION}" +hub pull-request -f --message="next development iteration: ${MVN_NEXT_SNAPSHOT_VERSION}" --message="Merge using merge commit rather than rebase" echo ""; echo "Preparing a merge-branch to merge into develop" @@ -177,7 +177,7 @@ git commit -s -a -m "set correct version" git push --set-upstream origin "merge_master_into_develop_after_release_${MVN_VERSION_RELEASE}" echo "Creating pull request to merge the merge-branch into develop" -hub pull-request -f -m "sync develop branch after release ${MVN_VERSION_RELEASE}" +hub pull-request -f -b develop --message="sync develop branch after release ${MVN_VERSION_RELEASE}" --message="Merge using merge commit rather than rebase" echo "It's ok to merge this PR later, so wait for the Jenkins tests to finish." read -n 1 -s -r -p "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";