2 ms·
I think you've covered the important stuff here, but I'd like to add one point: We do this because we have a requirement that we need to be able to rip out a t
by dasil003 18y ago
I think you've covered the important stuff here, but I'd like to add one point:
We do this because we have a requirement that we need to be able to rip out a topic branch at any time from this release
It's nice to be able to rip out topic branches at any time, but I would submit that once the topic branch is complete and its time to merge, the decision of whether to use it or not needs to be finalized. If you don't do that you're inflicting mental overhead on the developers to support the project manager's waffling. Depending on the nature of the topic and how modular and well-factored the code is, it may be more or less of a chore to maintain multiple branches, but unless both you're going to release both versions of the software, I say merge the branch ASAP and save yourself the trouble.
- mbrubeck 18y agoYes, definitely. No software is going to make it easy to rip out any of five or six branches late in development. With five branches, this means that you might ship any of 2^5 == 32 different products, and you don't know which until right before it's released. Merging late optimizes for the case where no branches are included, but as you've learned it makes it painful for the normal case where all (or most) do ship. Merging early optimizes for the case where all (or most) branches are included, but yes it makes it harder to remove a branch later on. Or you could always maintain each of the 32 possible release branches, and merge each topic branch continually with 16 of them... :) As a compromize, you can merge frequently from master to topic, but then merge topic back to master only when you are fairly confident in it. (Hopefully this will be early for at least some topic branches, so that any conflicts with other topics can be resolved early.) And I totally agree with the other commenters who suggest shorter iterations and continuous integration.