Thursday, 7 May 2026

Preliminary Findings

Preliminary Findings on Merge Conflict Fatigue

The code change is ten lines. The merge conflict is forty lines. Most of the forty lines are infrastructure that two developers touched independently without knowing about each other.