News for hackers. Stuff that matters.
Re:Code branching isn't required even for complex multi proj... by PaulHoule on Saturday July 02, 2011 @08:25AM (#2721522)
The video puts down "Feature Branching" which is a very specific kind of "Code Branching."

I've seen Feature Branching work for some shops, but it can also create problems -- the more complex version control strategy you use the more likely you're going to make mistakes implementing it.

The "standard model" for branching that's most commonly used is to do most development in HEAD and make branches for releases. If you spin version 1.1 of your product, you should make a 1.1 branch, which starts with, say, version 1.1.0. If you find a terrible bug in 1.1.0, you can go back to 1.1, develop the 1.1.1 version, and then you can merge the bug fixes back into head.

The "standard model" minimizes the number of merges that need to be made while assisting maintenance of deployed software. Other branching models do worthwhile things, but the ratio of merging/benefits is invariably worse.

There are no comments on this comment yet.