mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
MCP server · by sadayamuthu
About
mergelock is an MCP server published by sadayamuthu. Marketplaces we read that list it: 1 (Official MCP Registry). The last change we recorded was on 2026-10-17. As of our marketplace pass on 2026-10-21.
What it asks for
- Runs on your machine
None of the marketplaces we read publishes its tools or the settings it asks for.
What it declares, asks for and runs, in full
Only install plugins from developers you trust. We list what marketplaces publish and do not test plugins.
Works with
- Claude Code
- Codex
- Cursor
- VS Code
- Copilot CLI
A one-click link opens the client, which asks you to confirm before it adds the server.
From the marketplaces that list it and the MCP transport it declares, as each client documents them. We do not test plugins.
Connect
Commands and configs built only from what its marketplaces declare. We do not run them for you and do not test plugins.
As a local MCP server: Docker image
Built from what Official MCP Registry declares.
claude mcp add --transport stdio mergelock -- docker run -i --rm -v "<YOUR_REPO_PATH>:/repo" ghcr.io/sadayamuthu/mergelock:0.1.5[mcp_servers.mergelock]
command = "docker"
args = ["run", "-i", "--rm", "-v", "<YOUR_REPO_PATH>:/repo", "ghcr.io/sadayamuthu/mergelock:0.1.5"]{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"-v",
"<YOUR_REPO_PATH>:/repo",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}docker run -i --rm -v "<YOUR_REPO_PATH>:/repo" ghcr.io/sadayamuthu/mergelock:0.1.5Replace the values in angle brackets with your own. We show the names of the settings, never values.
Where it is published
| Marketplace | Status | Version | Figures | Verified | First seen |
|---|---|---|---|---|---|
| Official MCP Registry (Open the registry record) | Listed | 0.1.5 | Forks (GitHub): 1 Stars (GitHub): 2 |
Not marked |
Each figure is the marketplace's own and is never added up across marketplaces. A marketplace that publishes no figure shows none: no number is not zero.
How its figures have moved
- 2026-10-171
- 2026-10-201
- 2026-10-172
- 2026-10-202
Each dot is a day we read a different number; flat stretches are days the number did not move. Figures of different marketplaces are never added up.
What changed
- Official MCP Registry: released version 0.1.5 (was 0.1.4)
- Official MCP Registry: repository or package changed
- Official MCP Registry: repository or package changed
- Official MCP Registry: released version 0.1.4 (was 0.1.3)
- Official MCP Registry: released version 0.1.3 (was 0.1.2)
- Official MCP Registry: repository or package changed
- Became a product we track
- Official MCP Registry: appeared
Similar plugins
Products whose own names, descriptions, tools and skills are closest in meaning to this one, on every marketplace we read. Closeness is ranked within this list only.
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
merge-conflict-forecaster-mcp io.github.mrfentmen/merge-conflict-forecaster-mcp
Predict local Git merge-conflict pressure from branch topology and changed-file overlap without...
-
GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
-
mergewarden io.github.sjh9714/mergewarden
Check whether a coding agent's changes stayed inside the scope it was given.
-
Detect merge conflicts across git worktrees before they happen. Warns before writing to files that would cause merge conflicts when running multiple AI agents in parallel.
-
Local, deterministic review of Git changes: weakened tests and CI gates, risky flows, blast radius.
-
repo-forensics-mcp io.github.mrfentmen/repo-forensics-mcp
Local read-only MCP tools for Git repository archaeology, churn, hotspots, and hygiene. Tools...
-
Local Git via MCP: status, log, diff, file history, branches, and gated stage/commit. Pure-JS.
-
The official Letmediff MCP server helping you review your code with an agent first workflow
Similar plugins by marketplace
The same question asked of one marketplace at a time: is there an analog of this plugin there?
Has a listing on Claude Code: claude-plugins-community (5)
-
Self-hosted GitHub MCP server. PAT auth, stdio transport, transport-agnostic so it works with…
-
socraticode io.github.giancarloerra/socraticode
MCP server for enterprise local codebase indexing, semantic search, and code dependency graphs.
-
dep-diff-mcp io.github.DigiCatalyst-Systems/dep-diff-mcp
Translates a lockfile diff into a human-readable upgrade plan for npm, PyPI, and GitHub Actions.
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
Two skills in one plugin: (1) Automated git bisect for regression hunting — establishes boundaries, runs `git bisect run` with reproduction commands, analyzes the culprit commit…
Has a listing on Claude Code: claude-plugins-official (5)
-
gk-cli com.gitkraken/gk-cli
The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
Official GitHub MCP server for repository management. Create issues, manage pull requests, review code, search repositories, and interact with GitHub's full API directly from…
-
AI code review agent for GitHub and GitLab. View and resolve Greptile's PR review comments, run reviews on your working branch, and search your organization's knowledge base and…
-
Upstash Context7 MCP server for up-to-date documentation lookup. Connects to Context7's hosted remote MCP server (https://mcp.context7.com/mcp) — no local Node.js or npx required…
Has a listing on Claude: knowledge-work-plugins (5)
-
gk-cli com.gitkraken/gk-cli
The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.
-
Bring Qodo's codebase intelligence, coding standards, and code review into your coding agent.
-
MCP server for terminal commands, file operations, and process management
-
The Vanta plugin connects Claude Code to Vanta's security and compliance platform through the Vanta MCP server. It combines Vanta's test-specific remediation intelligence with…
-
Security review for Claude-generated code. Pattern-based warnings on edits, LLM-powered diff review on Stop, and an agentic commit reviewer that catches injection, XSS, SSRF…
Has a listing on Codex: openai-curated (openai/plugins) (5)
-
Inspect repositories, triage pull requests and issues, debug CI, and publish changes through a hybrid GitHub connector and CLI workflow.
-
Inspect recent issues and events in Sentry from Codex.
-
Qodo setup, code intelligence, and review workflows.
-
AI-powered code review in Codex, powered by CodeRabbit.
-
CrowdStrike Falcon Fusion skills for authoring, deploying, and executing Fusion workflows. Includes live action discovery, YAML authoring with schema validation, workflow import…
Has a listing on Community GitHub marketplaces (5)
-
Detect merge conflicts across git worktrees before they happen. Warns before writing to files that would cause merge conflicts when running multiple AI agents in parallel.
-
Git strategies, merge conflicts, and advanced version control expert
-
Read-only context and complete checks against patterns learned from git history. Local; no LLM.
-
Agents publish intent and claim semantic scopes before writing code, so two plans that cannot both be true collide in a queryable store instead of in your merge. Local-first…
-
Git-native decision memory for coding agents: only the decisions still in force for the edited path
Has a listing on Copilot CLI: github/awesome-copilot (5)
-
Reconstruct your dev context (branch, commits, uncommitted work, PR clues) and trigger a resume prompt to continue quickly.
-
Complete toolkit for building Model Context Protocol (MCP) servers in Kotlin using the official io.modelcontextprotocol:kotlin-sdk library. Includes instructions for best…
-
Complete toolkit for building Model Context Protocol (MCP) servers in TypeScript/Node.js using the official SDK. Includes instructions for best practices, a prompt for generating…
-
Visualize and guide the GitHub Copilot Modernize CLI Assess, Plan, and Execute workflow for .NET, Java, and C++ application repositories.
-
Complete toolkit for building Model Context Protocol (MCP) servers in Go using the official github.com/modelcontextprotocol/go-sdk. Includes instructions for best practices, a…
Has a listing on Copilot CLI: github/copilot-plugins (5)
-
Bring Azure DevOps work-item, repository, and pull-request workflows into GitHub Copilot.
-
Advanced Security plugin for GitHub Copilot.
-
Navigate and interact with your C++ code using the Microsoft C++ Language Server.
-
mcp-apps
Generate MCP App widgets for MCP tools. Produces self-contained HTML widgets using the MCP Apps protocol.
-
Toolkit for building Microsoft 365 Copilot declarative agents — scaffolding, JSON manifest development, and capability configuration.
Has a listing on Cursor: cursor/plugins (5)
-
Manage repos, issues, pull requests, and Actions.
-
Internal team workflows for CI, code review, shipping, local automation, and verification.
-
CLI-backed repo compatibility scans plus agents that audit startup, validation, and docs against reality.
-
Skills for building on the Cursor Origin API. Fetch the live spec first, then follow the Origin rules for credentials, scopes, webhooks, paging, and errors. Includes a skill that…
-
Render PR diffs as review canvases grouped by importance.
Has a listing on Docker MCP Catalog (5)
-
Git repository interaction and automation.
-
Tools for interacting with Git repositories.
-
MCP Server for the GitLab API, enabling project management, file operations, and more.
-
Analyze code quality and security with SonarQube Server or Cloud directly in AI assistants.
-
Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language.
Has a listing on Official MCP Registry (5)
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
merge-conflict-forecaster-mcp io.github.mrfentmen/merge-conflict-forecaster-mcp
Predict local Git merge-conflict pressure from branch topology and changed-file overlap without...
-
GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
-
mergewarden io.github.sjh9714/mergewarden
Check whether a coding agent's changes stayed inside the scope it was given.
Has a listing on npm registry (MCP servers) (5)
-
Run SQL queries and inspect database schemas through safe, visible MCP tools.
-
depwire io.github.atef-ataya/depwire
Dependency graph + 24 MCP tools. Impact analysis, simulation, security, agent coordination
-
Compare dotenv files and report which keys are missing or extra, by name only.
-
75 semantic Java analysis tools via Eclipse JDT: navigation, refactoring, code intelligence.
-
Read-only MCP server exposing the dsh-plugin-certification registry for DeepSeek Harness plugins.
Found by meaning, not by shared code or a shared repository: similar plugins stay separate products, and this is not a review or a recommendation.
Want this mark on your plugin in our catalog?
Prove you maintain it with a file in its repository, a file on your domain or a DNS record, and you can show this mark on the card, with live banners for your site and README. How verification works
You also get alerts when a marketplace lists it, drops it, changes its verified mark or what it asks for, and its remote endpoint goes on monitoring as a web service.
Data comes from the Official MCP Registry (registry.modelcontextprotocol.io), CC0 1.0. Figures come from our own regular passes over the marketplaces, last read on . We publish no contact details for plugin publishers.