Is it possible to make git flow merge the master branch into develop instead of the hotfix one on finish?

nvie / gitflow

Git extensions to provide high-level repository operations for Vincent Driessen's branching model.

http://nvie.com/posts/a-successful-git-branching-model/

Other

26.66k stars 2.67k forks source link

Is it possible to make git flow merge the master branch into develop instead of the hotfix one on finish? #6470

Open jeandat opened 2 years ago

jeandat commented 2 years ago

When you do git flow hotfix finish … the hotfix branch is merged into master and then into develop. I would rather merge master into develop once the hotfix branch has been merged into master. Is it possible to configure it that way? I do not see anything in documentation.

ChrisJStone commented 2 years ago

@jeandat you would probably have better luck at https://github.com/petervanderdoes/gitflow-avh/issues sine at least for windows machines that is the fork that comes with git for windows. Without changing the do_git commands in gitflow-hotfix-finish I don't know of a way to change the order of merge. However I'm not sure why this really matters since either way the commits made on the hotfix end up in develop.