| I'm not the parent, but I find the nvie.com branching workflow a little complicated. My experience lies a little bit with the kernel workflow, but heavily with the Openstack workflow, which has large codebases as well. Both workflows differ from the nvie.com workflow by not needing a 'develop' branch and as a result, needing less merges. Both Openstack and the Linux kernel use 'master' for development. In the kernel case, changes are reasonably well tested and vetted before they hit 'master' by the use of maintainer branches. In Openstack, all changes get gated through a variety of unit, functional and integration tests, so they are reasonably well tested as well. AFAICT, feature and release branches work the same in all three workflows. I guess both Openstack and the Linux kernel care less about hotfixes since neither run production systems, only their customers do. In my capacity running a production Openstack system, we apply hotfixes to our release branch and then deploy it from there. I guess I just really dislike all of the merging that happens in the nvie.com workflow and the extra 'develop' branch as a result. It seems unnecessarily complicated. |