MCP servers · cloudcorprecords

conflictfix: triage three-way merge conflict hunks

Classifies merge-conflict hunks as safe for mechanical resolution or risky, leaving risky hunks for manual review.

This text was machine-translated from the publisher's own information and has not been checked by a human editor. The publisher's original text is the reference.

This resource was imported automatically from the sources listed below and has not been reviewed by the AI Gate team yet. The description is the publisher's own, as published. Check the repository before installing.

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.0
    As shown on registry.modelcontextprotocol.io when we last read it
MCP servers
docker

Docker Hub MCP Server

Docker's MCP server that helps an AI assistant find and compare container images on Docker Hub and, with your token, manage your own repositories and tags.

171 GitHub starsCloud & DevOpsSoftware development
Updated 13 Nov 2026
MCP servers
awslabs

MCP servers for AWS (AWS Labs)

A large open-source collection of MCP servers from AWS Labs for building and operating on AWS: documentation, infrastructure, databases, AI services, cost and more.

9.9K GitHub starsCloud & DevOpsData & databases
Updated 17 Nov 2026
MCP servers
firecrawl

Firecrawl MCP Server (web search and scraping)

Firecrawl's MCP server that lets an AI assistant search the web, turn pages and PDFs into clean Markdown, crawl sites and interact with dynamic pages.

7.8K GitHub starsWeb, search & browserProductivity & automation
Updated 17 Nov 2026
MCP servers
neondatabase

Neon MCP Server (Postgres)

Neon's MCP server for managing Neon Postgres in plain language: create projects and branches, run queries and prepare schema migrations from your editor.

663 GitHub starsData & databasesSoftware development
Updated 19 Nov 2026
conflictfix: triage three-way merge conflict hunks | AI Gate Discover