Thierry de Pauw

Lean and XP software engineer, #ContinuousDelivery, dark chocolate, a little introvert, shy, opinionated.




NewCrafts 2018

Feature Branching considered Evil

  • talk
  • Practices
  • Developer's life

Feature branching is again gaining in popularity due to the rise of Distributed Version Control Systems (DVCS). Although branch creation became very easy with DVCSs, it comes with a certain cost. Long living branches break the flow of the software delivery process impacting throughput and stability.

This session explores some of the reasons teams are using feature branches for, what problems are introduced by using feature branches and what techniques exist to avoid them all together. In conclusion it explores what exactly is evil about feature branching. Which is not necessarily the problems they introduce. But rather the real reasons teams are using them for.

The key takeaway is an appreciation of a different branching strategy and how it relates to Continuous Integration.

The target audience is anyone using version control systems in a Continuous Integration and Continuous Delivery context.

separator


DiversityCharter
Code of conduct

Our conference is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, or religion (or lack thereof). We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks, workshops, parties, Twitter and other online media. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organisers.