When a client is planning concurrent development of consecutive releases (and implicitly lots of developers), there's a set of techniques that work well

Trunk Based Development

todo

Branch by Abstraction

todo

Feature Toggles

todo

My blog entries on this class of TBD, BBA, Feature Toggles, etc

• September 24^th, 2014 » A Functional Branch by Abstraction Case Study
• August 12^th, 2014 » Trunk supporting practices
• January 14^th, 2014 » Convincing Executives To Switch To Trunk-Based Development
• April 5^th, 2013 » What is Trunk-Based Development?
• March 19^th, 2013 » The Cost of Unmerge
• March 13^th, 2013 » Facebook's Trunk-Based Development (take 2)
• March 11^th, 2013 » Legacy App Rejuvenation
• March 4^th, 2013 » Trunk-Based Development at Facebook
• November 1^st, 2012 » Testability and Cost of Change
• July 10^th, 2012 » Feature Toggles: App-config workflow using SCM
• April 24^th, 2012 » Call to Arms: Average Story Sizes of One Day
• September 30^th, 2011 » Branchable Continuous Integration
• May 13^th, 2011 » Avoiding 'Big Bang' for Branch By Abstraction
• December 7^th, 2010 » Branch By Abstraction Log Jam
• April 26^th, 2007 » Introducing Branch By Abstraction