Earlier this year, I assisted a company in designing a simple source code branching and merging plan. But of course, I have learned some things since that time. I just returned from the Microsoft ALM Conference, and I want to offer some additional insight into branching and merging. (updated 11/25/2011 after further reflection to strengthen defense of the Basic Plan recommendation) (more…)