Version Control

The Practices That Make Continuous Integration

Aug 26, 2022 • 0 min


Continuous Integration is by itself already a practice. It is one of the most critical to adopt to enable the fast flow of work through the value stream. However, many teams believe Continuous Integration is just a tooling problem, to then say they practice Continuous Integration.

On the Evilness of Feature Branching - How To Avoid The Problems?

Jun 14, 2022 • 5 min


In part 4 of this series - The Problems I dived deep into the problems introduced by feature branching. But, what can we do about this? How can we avoid the problems introduced by feature branching altogether?

On the Evilness of Feature Branching - The Problems

May 30, 2022 • 23 min


In part 2 of this series - Why do Teams use Feature Branches? - and part 3 - But Compliance!? I went into all the possible reasons teams mention themselves to why they use feature branches. This time I want to go deeper into the problems introduced by the use of feature branches.

You Are What You Eat - How Branching Affects Team Culture

May 7, 2022 • 2 min


Your branching strategy is an extremely important choice to make. In this talk I hope to show how a change of branching strategy can actually change your team’s mindset. Specifically I look at a shift from a feature branching strategy to a trunk based strategy affected the team. In my view these changes were for the better and I guess most at PIPELINE will agree but I leave that for others to decide on this occasion.

On the Evilness of Feature Branching - But Compliance

Feb 22, 2022 • 11 min


In part 2 of this series - Why do Teams use Feature Branches? - I examined all the possible reasons teams mention for why they use feature branches. There was, however, one reason, I did not mention that people referenced as the ultimate reason: “We use feature branches and pull requests to comply with regulations”. I would like to explore this and show there are other options to comply that do not have the same drawbacks.

Feature Branches and Toggles in a post-GitHub World

Dec 13, 2021 • 26 min


Why I got interested in micro services? Because from my early days at ThoughtWorks was actually helping people ship software more quickly. I spent lots of time looking at Continuous Integration, Continuous Delivery, cloud automation, infrastructure automation, automated tests, and all these sort of things. And realise that actually it was the architecture of these systems that made it hard to ship software more quickly.

On the Evilness of Feature Branching - Why do Teams use Feature Branches

Oct 25, 2021 • 18 min


In part 1 of this series - a Tale of Two Teams - I introduced two quite different teams. One novice team practising trunk-based development, the other experienced but being used by GitFlow. Now I would like to explore why teams use feature branches. What are their reasons? What problems are they trying to solve with long-running branches?

On the Evilness of Feature Branching - A Tale of Two Teams

Jul 14, 2021 • 7 min


On the experience of working with two totally different teams: one novice practising trunk-based development, the other very experienced being used by GitFlow.

On the Evilness of Feature Branching

Apr 26, 2021 • 0 min


Branch creation became very easy with the advent of Distributed Version Control Systems. However, it comes at an unquestionable cost. Long living branches break the flow of the IT delivery process, impacting both stability and throughput.

Feature Branching considered Evil

Oct 29, 2016 • 0 min


Feature branching is again gaining in popularity due to the rise of distributed version control systems. Although branch creation has become very easy, it comes with a certain cost. Long living branches break the flow of the software delivery process, impacting throughput and stability.