I have been looking at gitflow and maybe someone can clear up this reasoning for me. The merge of a hotfix is done back into master and into develop. It seems to me it should merge to release as well. Release gets merged into develop and master anyways. The problem I see with not merging hotfixes into release is that if I build a release and it passes, merge that release into master but there are hotfixes in master that weren't included in my release build, technically I should revalidate again. If hotfixes were merged into release as well and that build passed, there would be no need for a rebuild after things were merged into master. Also, release gets merged back into develop anyways, so merging into release would by default get those changes back into develop. This is a gripe more with the standard gitflow than with the fact that Source Tree has implemented it this way, but maybe there is a reason for it.
After-re-scanning Nvie's blog, he appears to agree with you: "when a release branch currently exists, the hotfix changes need to be merged into that release branch, instead of
develop". However, I can't explain why he wouldn't have programmed that behavior into his own plugin.
On October 21st, 2020 we hosted a webinar titled, Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events