The Merge Conflict Problem Nobody Talks About

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.

Here’s what actually happens when a conflict appears. You’re in the middle of implementing a feature, fixing a bug, or reviewing changes when Git suddenly pauses everything. Now you’re staring at conflict markers in files you may not have opened in weeks. Before you can write another line of code, you have to reconstruct the intent behind two competing sets of changes, decide which version is correct, or whether both belong together, and hope you don’t accidentally undo someone else’s work.

The real cost isn’t the time spent resolving the conflict. It’s the interruption. Merge conflicts force you to stop solving today’s problem and start investigating yesterday’s decisions. By the time you’ve rebuilt enough context to make the right call, you’ve paid a tax on your attention that never appears in a sprint report or velocity chart. Across a team shipping every day, those interruptions quietly become one of the biggest sources of friction in the development workflow.

That’s exactly the problem GitLens 18.2 set out to solve.

Introducing GitLens 18.2: AI-Powered Conflict Resolution

GitLens 18.2 introduces AI-powered conflict resolution directly into the Commit Graph, helping developers work through merge conflicts faster without giving up control. Whether you’re resolving a merge, rebase, or cherry-pick, GitLens lets AI handle the repetitive work while you stay focused on the decisions that matter.

Instead of opening conflicted files one by one and manually comparing changes, GitLens processes every conflicted file in parallel, proposes a resolution for each one, and presents every result as a reviewable diff before anything touches your working tree. The goal isn’t to replace developer judgment. It’s to remove the tedious work that gets in the way of it.

Every Conflict. At Once.

Traditional conflict resolution is a serial process.

Open a file.

Read the conflict markers.

Decide what to keep.

Save it.

Repeat.

GitLens takes a different approach.

The new Resolve mode works through every conflicted file simultaneously, streaming progress as it goes while classifying each result. Files might be merged automatically, keep the current version, take the incoming version, be deleted, or be flagged as Needs Review when the AI isn’t confident enough to make the decision itself.

Instead of spending your time performing the mechanics of conflict resolution, you spend it reviewing proposed solutions.

A Workflow Built Around Review, Not Guesswork

When a merge, rebase, or cherry-pick pauses on conflicts, GitLens adds a new Resolve action directly where you’re already working, in the Commit Graph, the sidebar, and the Command Palette.

The workflow is simple:

• Start Resolve with AI from the Commit Graph, sidebar, or Command Palette.
• GitLens resolves every conflicted file in parallel.
• Review each proposed resolution as a diff with an explanation of the AI’s reasoning.
• Refine the entire resolution, or a single file, with additional prompts if needed.
• Apply only the resolutions you trust. Files marked Needs Review remain conflicted until you decide how to handle them.

The result is a workflow that keeps developers reviewing code instead of untangling conflict markers.

AI Does the Work. Developers Make the Decisions.

The most important design decision in GitLens 18.2 isn’t that it uses AI. It’s how it uses AI.

GitLens never applies changes automatically. Every proposed resolution is reviewable before it reaches your working tree, and when the AI isn’t confident, it says so. Files are explicitly marked Needs Review instead of forcing a questionable merge behind the scenes.

That distinction matters. AI handles the repetitive comparison work and drafts a proposed resolution, but developers remain the final checkpoint before anything changes. You’re not trusting AI to make decisions for your repository. You’re using it to eliminate the busywork that slows those decisions down.

Keeping Developers In Flow

GitLens has always focused on helping developers understand their repositories and make better Git decisions. AI-powered conflict resolution is a natural extension of that philosophy.

As AI writes more code and teams work across more branches in parallel, merge conflicts aren’t becoming less common. They’re becoming more disruptive. The challenge isn’t generating code anymore. It’s staying in flow while managing everything that happens after the code is written.

GitLens 18.2 removes one of the biggest interruptions in that workflow by turning conflict resolution from a repetitive manual process into a guided review experience. Instead of spending your time deciphering conflict markers, you spend it validating solutions and getting back to building software.

That’s what better Code Flow looks like.

Get Started

GitLens 18.2 is available now on the VS Code Marketplace.

Update GitLens or install it for the first time, and the next time a merge, rebase, or cherry-pick pauses on conflicts, Resolve with AI will be ready inside the Commit Graph.

Try GitLens free today. When you’re ready to bring AI-powered conflict resolution to your private repositories, upgrade to GitLens Pro.