Git Flow Hotfix - Peer Review and Merge to Remote Master and Development
I have a fix that I would like to submit for peer review.
I am using git-flow http://nvie.com/posts/a-successful-git-branching-model/
git-flow has no command git flow hotfix publish
.
How I solve the following:
local
git flow hotfix start v1.0.1
make changes to files, git add and git commit as normal.
git push
remote
Ask a team member to pull / review the hotfix branch
local
git flow hotfix finish
git push origin master
git push origin develop
git push --tags
remote
delete the hotfix branch
It seems a little awkward. I want to be able to submit a pull request to the patch branch for both the development branch and the master on a remote machine. Then I want to make git pull my local master and develop the branches to keep them in sync.
source to share
It is true that the fixes cannot be published (see issue 92 ).
But this feature was implemented in this gitflow fork (AVH Edition) .
See commit 0b324de : even if it is not the exact sequence of commands you follow, you can easily adapt it to suit your purpose.
source to share