Skip to content

Commit

Permalink
chore(scripts) fix branching model for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
kikito committed Apr 25, 2022
1 parent c5af6f7 commit e7957f8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/make-patch-release
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e7957f8

Please sign in to comment.