Skip to content

Commit

Permalink
GH-1995 target develop branch for sync PR
Browse files Browse the repository at this point in the history
- added PR body message reminding to use merge commit
  • Loading branch information
abrokenjester committed Mar 13, 2020
1 parent 892d482 commit ebd0aa8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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";

Expand Down

0 comments on commit ebd0aa8

Please sign in to comment.