Continuous Delivery and Feature Toggle

So you want DTAP? Nice, but what about a Continuous Delivery (CD) environment? That will bring more speed in the delivery process, why wait till the end of a sprint to deliver when you can do it in an instant. Adding business value when you are done!

But what about all outstanding changes? When you want to avoid merging hell, there is another way to go, it's called Feature Toggle. Just keep a file with toggles (true or false) on functionality and business rules and only activate them when you are really done.

http://martinfowler.com/bliki/FeatureToggle.html