Merge conflict resolution: 223 files, one call each

When two branches change the same lines, someone has to write the merged version. Merget’s first resolver asks a model once per conflicted file, with no agent loop. We replayed 223 conflicted files from real merges in 4 open-source repositories, twice, and compared each result with what git had already merged and with what the project’s developers wrote.

Merget resolved all 223 conflicted files in both runs, at about $0.018 per file in modeled cost. Every one of the 214 checkable outputs kept Git’s already-merged text and contained no conflict markers, and about 84% matched the developers’ own resolution.

MeasuredOctober 30, 2026
MethodOne model call per conflicted file
Corpus223 conflicted files, 4 repositories

223 conflict resolutions. One model call per file. Repeated twice, with Git’s already-merged text preserved in all 214 auditable outputs.

223/223conflicted files resolved in each of two runs
0conflict markers left in the 214 checkable filesgit’s merged text kept in all 214
~84%of checkable files matched what the developers wrote179 and 181 of 214 in the two runs
$0.018modeled cost per conflicted file$0.0177 and $0.0181 in the two runs
Checkable

In 9 of the 223 files one side deleted the file while the other changed it, so there is no merged text to compare. The checks for markers, for git’s merged text and for the developers’ match use the other 214.

Kept git’s merged text

Outside the conflicts, the file still holds exactly what git had merged on its own. A resolver that edits there changes code nobody asked it to touch.

Matched the developers

The file matches the resolution the project’s developers committed at the time. A different resolution can still be a correct one.

Modeled cost

Real tokens at the model’s list price, with the model’s thinking billed as output and cached tokens charged at the full input rate, so a real bill is lower.

Real conflicts from Vue, Express, Tokio and Flask. All attempted files were resolved; Vue contributed 163 of the 223.

How to read thisBars on the left count the conflicted files each repository contributed. On the right, modeled dollars per file, the average of the two current runs; that track ends at $0.035.

Conflicted filesModeled cost per fileaverage of the two current runs
vuejs/coreConflicted files: 163Modeled cost per file · average of the two current runs: $0.0149runs: $0.0147 and $0.0151
expressConflicted files: 42Modeled cost per file · average of the two current runs: $0.0294runs: $0.0291 and $0.0297
tokioConflicted files: 15Modeled cost per file · average of the two current runs: $0.0198runs: $0.0197 and $0.0200
flaskConflicted files: 3Modeled cost per file · average of the two current runs: $0.0086runs: $0.0088 and $0.0084
Full results: both runs

Both runs: every file resolved, git’s merged text kept and no markers left, with the match rate per run.

RunDateResolvedKept git’s merged textMarkers / open fences leftMatched the developers
Run 12026-10-30223 of 223214 of 2140 / 0179 of 214 (83.6%)
Run 22026-10-30223 of 223214 of 2140 / 0181 of 214 (84.6%)

The token counts behind the modeled cost. Output tokens include the model’s thinking.

RunInput tokensOutput tokensModeled costPer file
Run 11,205,242152,564$3.936124$0.0177
Run 21,205,242163,256$4.043044$0.0181

For conflicts like these, one model call per file was enough. Agent sessions are kept for the conflicts that need them.

The one-call resolver resolved every one of the 223 benchmark files. None of the 214 checkable outputs left a conflict marker or changed what Git had already merged, and about 84% matched the developers’ own resolution.

Its model cost was about $0.018 per file. In the queue, this resolver runs first, and Merget falls back to an agent session only when it is needed.

Next step

Try it on your conflicts. Connect one repository and see what Merget resolves between your open pull requests.

Sign up free
How we ran it

Measured October 30, 2026: one model call per conflicted file, production settings, up to 10 merges per repository from vuejs/core, express, tokio and flask.