Continuous Integration vs Feature Branch Workflow

Continuous Integration and Feature Branching are both very popular ways of organising work in a development team, but they are mutually exclusive for most cases. This is counter to what many, maybe most people think. In this video Dave Farley explains the difference and why the two are largely mutually exclusive, and then explains how to live in the CI world by describing three different approaches to keeping the software working as it evolves.

Software engineering, any engineering, is all about trade-offs, the trade-off at the heart of CI is that to avoid conflicts our aim is to integrate our code with that of our co-workers as close to “continuously” as we can, that means that we can’t afford to wait until we are finished. If we take that idea one step further into Continuous Delivery, then every change may end up being deployed into production, so we need to grow our software, through many small changes, committing multiple times per-day, and be comfortable that, at any point in that process, the software may be released into production. How do we use ideas like dark-launching, branch-by-abstraction and feature-flags to help?

-------------------------------------------------------------------------------------

If you want to learn Continuous Delivery and DevOps skills, check out Dave Farley's courses:
➡️ https://bit.ly/DFTraining

Dave's NEW BOOK "Continuous Delivery Pipelines" - a step by step guide to building Better Software Faster, is now available:
➡️ https://leanpub.com/cd-pipelines

Dave's award-winning, original "Continuous Delivery" book, available here:
➡️ https://amzn.to/2WxRYmx

-------------------------------------------------------------------------------------

Join our Mail List to get Dave Farley's FREE “How To…” guide ~Pair Programming~ here ➡️ https://www.subscribepage.com/cd-pair-guide

--------------------------------------------------------------------------------------

Dave Farley's Blog ➡️ https://bit.ly/DaveFWebBlog

Dave Farley on Twitter ➡️ https://bit.ly/DaveFTwitter

Dave Farley on LinkedIn ➡️ https://bit.ly/DaveF-LI

--------------------------------------------------------------------------------------

BOOKS:

Continuous Delivery, by me and Jez Humble ➡️ https://amzn.to/2WxRYmx

Extreme Programming Explained: Embrace Change, Kent Beck ➡️ https://amzn.to/2GpQRjE

Accelerate, The science of Lean Software and DevOps, by Nicole Fosgren, Jez Humble & Gene Kim ➡️ https://amzn.to/2YYf5Z8

The DevOps Handbook, by Gene Kim, Jez Humble, Patrick Debois & John Willis ➡️ https://amzn.to/2LsoPmr https://amzn.to/2LsoPmr

--------------------------------------------------------------------------------------

RERERENCES:

Trunk Based Development ➡️ https://trunkbaseddevelopment.com/
Read More About Branching ➡️ https://martinfowler.com/articles/branching-patterns.html

Видео Continuous Integration vs Feature Branch Workflow канала Continuous Delivery