What it does
conflictfix classifies each hunk of an existing three-way merge conflict as either safe for mechanical resolution or risky. A hunk is safe when both sides are identical, when only one side changed relative to the common ancestor (that side wins, including when it deleted every line), or when the two sides differ only in whitespace (the resolution is the 'ours' lines, unchanged). Every other hunk is marked 'conflict', has no resolution, and is never auto-merged. The result lists each hunk's index, class, safe flag and resolution, along with safe and risky counts and whether the file is fully resolvable.
Use it when a merge conflict already exists and you need to decide, hunk by hunk, which parts can be resolved without human review. It is available as a command-line tool and as an MCP server exposing a triage_conflicts tool, so an AI client can call it with line arrays it has been given.
You supply the file path and, for each hunk, the base, ours and theirs line arrays. The computation is local and pure: it does not read a repository, perform a merge or modify files. The CLI reads an args.json file and exits with 0 on success, 1 on a runtime or invalid-input error, and 2 on a usage error. Malformed input returns a validation error naming the offending field, with no partial result.
Limitations and requirements
The caller must supply the base, ours and theirs line arrays; the tool reads no repository and performs no merge. Risky hunks are never auto-merged. Malformed input, such as a missing or empty path, an empty hunks list, or non-string lines, is rejected with a validation error and no partial result.
Safety
Our team has not reviewed this resource. Only automated rules checked it; resources with high-risk signals are not published. These are signals, not a guarantee that installing it is safe. Try it in a sandbox project first.
- Runs code or changes an assistant's behaviour
Sources
- Official MCP Registry first seen 13 Nov 2026 · last seen 13 Nov 2026 · its page on the source
io.github.CloudCorpRecords/conflictfix
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
v0.1.0As shown on registry.modelcontextprotocol.io when we last read it