Hotfix Merge to Release Gitflow

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.

Thoughts?

1 answer

This widget could not be displayed.

SourceTree supports the original gitflow plugin (description). All the behavior you describe is controlled by that.

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.

There are feature requests for getting SourceTree to switch to a fork of Nvie's gitflow (Nvie's is no longer maintained), but I'm not sure what its behavior would be in this scenario.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Monday in Teamwork

The tools we make for teams? We use them every day at Atlassian to get shit done (and it works).

I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...

38 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you