What are the best practices of merging hotfix branch into master/develop?
Do I need to merge it into both branches
hotfix → master
hotfix → develop
or merge to master and then to develop after.
hotfix → master → develop
Asked
Active
Viewed 497 times
4
Vladimir Nani
- 2,774
- 6
- 31
- 52
-
It depends on how you use develop and master. – taskinoor Sep 30 '14 at 10:16
-
@taskinoor I use them according to [successful git branching model](http://nvie.com/posts/a-successful-git-branching-model/). – Vladimir Nani Sep 30 '14 at 10:35
1 Answers
0
You can merge your hotfix branch into both master and develop (according the the popular successful git branching model)
git checkout master
git merge --no-ff hotfix
git checkout develop
git merge --no-ff hotfix
You can then delete your hotfix branch safely.
Or use git cherry-pick <hotfix-commit-hash> on both develop and master branch.
Cherry-picking is the easiest way to bring a single/few commit(s) into branches.
RaphDG
- 1,351
- 10
- 17
-
1Agree, do you have any remarks about `hotfix → master → develop` – Vladimir Nani Sep 30 '14 at 10:39
-
I'm hoping you meant to say "cherry-picking is the *WORST* way". It's not a good strategy for that model. – Andrew C Sep 30 '14 at 15:55
-
I don't think this answers the OP's question. I think that the two merging strategies technically have the same results. – rcourtna Dec 11 '14 at 23:19