From e7957f8554a6b700a19949a469f98ec7a3c1c08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Garci=CC=81a=20Cota?= Date: Thu, 21 Apr 2022 22:16:43 +0200 Subject: [PATCH] chore(scripts) fix branching model for merge --- scripts/make-patch-release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/make-patch-release b/scripts/make-patch-release index 71a5e714b6f..eeaec9482f5 100755 --- a/scripts/make-patch-release +++ b/scripts/make-patch-release @@ -240,13 +240,13 @@ case "$step" in ;; #--------------------------------------------------------------------------- merge) - CONFIRM "Press Enter to merge the PR into master and push the tag and Github release" \ + CONFIRM "Press Enter to merge the PR into $base and push the tag and Github release" \ "or Ctrl-C to cancel." set -e git checkout "$branch" git pull - git checkout master + git checkout "$base" git pull git merge "$branch" git push