LocalFree

mergelock MCP server

sadayamuthu/mergelock

Merge gate for parallel coding agents: reports conflicts git can't see between two branches (changed signatures vs new call sites, deleted-but-still-used symbols, duplicate functions) for TypeScript, JavaScript and Python, with a suggested fix per finding.

0 GitHub stars1 forks
Source code

Install mergelock in Claude Code

Claude Code
claude mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5
mcp.json (Claude Desktop, Cursor, VS Code, Windsurf)
{
  "mcpServers": {
    "mergelock": {
      "command": "docker",
      "args": [
        "run",
        "-i",
        "--rm",
        "ghcr.io/sadayamuthu/mergelock:0.1.5"
      ]
    }
  }
}

Frequently asked questions

What does the mergelock MCP server do?

Merge gate for parallel coding agents: reports conflicts git can't see between two branches (changed signatures vs new call sites, deleted-but-still-used symbols, duplicate functions) for TypeScript, JavaScript and Python, with a suggested fix per finding.

Is the mergelock MCP server free?

Yes, most likely. Open source and no paid account or API key is mentioned in the listing. Check the provider for current pricing.

Does mergelock run locally or remotely?

Local. Runs on your machine (stdio). You install it with npx, uvx, Docker or from source.

How do I add mergelock to Claude Code?

Run: claude mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5

More version control MCP servers

View all

VibeRevert

0667

madeinplutofabio/vibe-revert

Local safety layer for coding agents: deterministic risk checks, checkpoints and policy inspection, plus restoring files to their pre-session state.

LocalFreeTypeScript

Github

0

jaimenbell/github-mcp

Unofficial read/write access to the GitHub REST API, with configurable tool groups, writes off by default and typed rate-limit handling.

LocalAccount neededPython

Actionpin

0

CloudCorpRecords/actionpin

GitHub Actions supply-chain hardener: audit workflows for unpinned actions and build a SHA pin plan.

LocalFree

Windows CLI

SimonB97/win-cli-mcp-server

MCP server for secure command-line interactions on Windows systems, enabling controlled access to PowerShell, CMD, and Git Bash shells.

LocalFree

Agent Guard

0

Kavachh/agent-guard-mcp

Git-aware safe file ops for AI agents: delete anything except git-tracked source code.

LocalFree

Smart Git

0

rafim-dev/mcp-smart-git

Git helper for conventional commits, pre-PR secret audits and merge conflict resolution.

LocalFreeTypeScript