Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
jeandat opened this issue Mar 9, 2022 · 1 comment

Comments

@jeandat
Copy link

jeandat commented Mar 9, 2022

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
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants