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