MCP servers that ship as code — a repository or a package you install and run locally (usually over stdio). They have no hosted endpoint, so we cannot probe or grade them: instead each one shows its repository, install command, license, stars and when it was last updated.
Collected from GitHub repositories and npm, PyPI, Cargo, Go, Maven, NuGet and RubyGems packages tagged as MCP servers, the official MCP Registry, Docker's MCP catalog, ModelScope, Baidu MCP World, Cline and other public directories; one entry per repository. A server that also offers a hosted endpoint is listed under Remote instead. These entries are not counted in our reachability, verification or readiness statistics.
-
Predict local Git merge-conflict pressure from branch topology and changed-file overlap without returning source content.
npm MIT -
MCP server that lets Claude Desktop and other MCP hosts analyze and resolve Git merge conflicts, with the host model reasoning over each hunk directly. Also ships a FastAPI REST API with Gemini-backed smart resolution. Shared services layer, session-scoped history, hardened parser.
★ 1 -
conflictsgithub.com/hegner123/conflictsupdated this year
Merge conflict parser MCP tool. Structured JSON output from git conflict markers
MIT -
semamergegithub.com/vineethwilson15/semamergeupdated this year
MCP server that detects semantic (non-textual) merge conflicts between Git branches using AST-level analysis
npm MIT -
MCP server for Rosentic - cross-branch conflict detection for parallel AI coding agents: catches breaking signature changes, HTTP route breaks, and schema drift between agent branches before merge
pypi MIT -
mcp-merge-guardgithub.com/paolino/mcp-merge-guardupdated this year
MCP server that guards PR merge decisions by validating CI, approvals, conflicts, and branch freshness
-
Catch merge conflicts git can't see between parallel AI agent branches: changed signatures vs new callers, deleted symbols still in use. TS/JS/Python. CLI + MCP server.
oci Apache-2.0 -
snapeditgithub.com/rianprei/snapeditupdated this year
Snapshot-based editing for AI agents: send only the NEW content via stdio MCP. Immutable sha256 snapshots, 3-way merge, conflict detection, ambiguity-safe zero-write applies, cross-process locks.
MIT ★ 2 -
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
npm MIT -
mcp-federated-cataloggithub.com/joeyen-atscale/mcp-federated-catalogupdated this year
Merge describe_model from many AtScale clusters into one catalog, with provenance and conflict policies
-
asynkorgithub.com/asynkor/asynkorupdated this year
File leasing for AI agent teams. One MCP server. Any IDE. Zero merge conflicts.
Apache-2.0 ★ 52 -
MCP server that profiles a contact export, finds duplicate people with evidence-based matching, merges them, and reports every conflicting value.
MIT -
gitsocketactive
Sync layer for AI agents working on the same repo: presence, soft path claims, and overwrite warnings before the merge conflict. Claude Code hooks + CLI + MCP server.
npm UNLICENSED -
agentsyncgithub.com/dipakkr/agentsyncupdated this year
A multi-agent collaboration hub for AI coding teams. Many humans and AI agents work on one repo from a shared plan — with file-scope claims, live chat, and MCP-native conflict warnings that keep fast agents from colliding. Zero merge conflicts.
MIT -
Smart Git Model Context Protocol (MCP) server & CLI for conventional commits, pre-PR security secret audits, and merge conflict resolution.
MIT -
Catch broken merges between parallel AI coding agents (Claude Code, Codex, cmux, Orca, git worktree). Combines worktree branches, checks conflicts and contract breaks, runs affected tests. Local CLI + MCP server.
MIT ★ 2 -
Kanbanana replaces sprawling, merge-conflict-prone markdown coordination files (BOARD.md, GPU_LOCK.md, SKILL.md) with an atomic SQLite-backed HTTP MCP server, A2A (/.well-known/agent.json) agent discovery & task dispatch, isolated Git worktree provisioning and FIFO feature locks
-
Version control for agent harnesses that change while they run: every step stamped with its harness version, gated patches, blame per metric, and three-way merge of harness manifests with conflicts resolved by Claude Code, its only LLM. Rust core, CLI, MCP server, Python SDK.
Apache-2.0 ★ 1 -
agentedgithub.com/frane/agentedno update data
A text editor for LLMs, not humans. Take ed, the line editor that nobody has voluntarily used since about 1975, and rebuild it for an environment where the typing user is a language model. Short verbs, line addresses, no modes, no TUI. What an editor optimises for changes when the user is the model: round trips per task, tokens per command, an editing buffer with a long memory, and an undo tree that remembers the branches the agent abandoned, because that's often where the interesting work was. ## Features - **Fewer round trips.** Read-before-Edit is unnecessary; on conflict the response carries the new content so you reconcile in one call instead of pre-reading every time. - **Branching undo.** Walked-back work stays addressable instead of being thrown away when you pick a different path. - **Three-way merge.** Concurrent agents get a structured conflict response instead of a silent overwrite. - **Atomic batches.** Multi-file refactors run all-or-nothing instead of leaving half-applied state on failure. - **Cross-file moves and regex replace as primitives.** Operations the built-in tools can't express cleanly become single calls. - **Drift detection.** External edits to an open file are folded into the tree instead of being clobbered by the next write. - **Inline diagnostics.** Type errors and lint findings surface on save, not at the next build many edits later. - **Cross-session memory.** Per-file notes persist between sessions and surface inline on the next open. - **Audit log.** Every operation recorded with actor and timestamp, so two agents in one workspace can't argue about who moved the head. ## Multi-workspace (v0.4.0) One MCP server registration handles every project you mention. Tool calls route to the workspace owning the absolute path you pass; each project gets its own SQLite, its own undo tree, its own LSP daemon — lazily spawned on first touch. Desktop hosts (Claude Desktop, Codex Desktop, Cursor) install the server once globally and use it across projects without per-project config. ## Install `ae` must be installed locally; this MCP bundle registers `ae serve` as a stdio server. ```sh brew tap frane/tap && brew install agented # or curl -sSL https://raw.githubusercontent.com/frane/agented/master/install.sh | sh ``` Pure Go, single static binary, Apache 2.0. Source: https://github.com/frane/agented
smithery -
GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)
npm MIT -
gfixgithub.com/ameyypawar/gfixupdated this year
Binary releases for gfix -- the cross-agent MCP-native merge resolver.
NOASSERTION ★ 1 -
MCP server exposing git-insight branch graph, merge preview, batch survey, merge-order planning and MR creation
npm MIT -
Mission control for AI coding agents: every PR on the architecture map, an MCP server, a tamper-evident record of who decided what, and which branches in flight will collide.
MIT ★ 6