gitflow icon indicating copy to clipboard operation
gitflow copied to clipboard

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

Open jeandat opened this issue 3 years ago • 1 comments

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.

jeandat avatar Mar 09 '22 15:03 jeandat

@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.

ChrisJStone avatar Apr 04 '22 16:04 ChrisJStone