Cure the Disease, Not the Symptoms

So, how much do you enjoy merging code from different development branches? Not at all? Neither do I. If you’re like me, you’ve probably had your fair share of merge nightmares. Remember the project I talked about in Chapter 12, Discover Organizational Metrics in Your Codebase? You know, the story of the project that got stacked with four times as many developers as needed to get it done “faster”?

In that project, one of the major bottlenecks turned out to be parallel work. We often spent a few hours adding a feature, only to find out that the relevant code had been rewritten in another branch. Not only is that way of working frustrating, it’s also expensive and a sure way to breed defects. We don’t want ...

Get Your Code as a Crime Scene now with the O’Reilly learning platform.

O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.