GitLens 18.2: AI-Powered Merge Conflict Resolution for VS Code
Merge conflicts rarely make it into a sprint retrospective, but they should. They’re one of the most reliable ways to lose an hour of flow without anyone noticing it’s gone. Every developer expects them eventually, but almost nobody questions the workflow around resolving them.