Old-school branch-per-feature meant that branches were large and long living to avoid having to integrate because it was a pain. This was a vicious circle as the feature would diverge further and further from other features or the mainline. Including and excluding features from what needs to be shipped should be a smooth process.
This talk goes into the mechanics of a disciplined process to ensure delivering the highest quality software, quickly without resorting to non-production code such as feature toggles. Some advanced topics such as git rerere and submodule orchestration will be covered as well as revisiting topics such as Continuous Deployment and Integration, the
role of QA and others.
This will talk will include an experience report of a 20 person team using the strategy on a system that involves 50 repositories that include many internal and external applications, services and processes.