You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
@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.
When you do
git flow hotfix finish …
the hotfix branch is merged intomaster
and then intodevelop
.I would rather merge
master
intodevelop
once the hotfix branch has been merged intomaster
.Is it possible to configure it that way? I do not see anything in documentation.
The text was updated successfully, but these errors were encountered: