MCP server

mergelock

io.github.sadayamuthu/mergelock

Checked 26 Oct 2026, 08:31 UTC · Checked against OSV.dev for malware and vulnerabilities; never run by us

Finds merge conflicts git can't see between branches: changed signatures vs new callers.

Website Source

At a glance

Type

MCP server

Publisher

Not verified

Status

Runs on your computer

Sets up in

Claude Code, Claude Desktop, Codex, Gemini CLI, Cursor, VS Code

Last checked

26 Oct 2026, 08:31 UTC

Connect it to your agent

Add to CursorAdd to VS CodeVS Code Insiders

Opens the app, which shows the server and asks you to confirm. It then runs the package on your computer with your permissions. For other apps, copy the setup below.

Claude Code

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

Claude Desktop

{"mcpServers":{"mergelock":{"command":"docker","args":["run","-i","--rm","ghcr.io/sadayamuthu/mergelock:0.1.5"]}}}

Codex (config.toml)

[mcp_servers.mergelock]
command = "docker"
args = ["run","-i","--rm","ghcr.io/sadayamuthu/mergelock:0.1.5"]

Gemini CLI

{"mcpServers":{"mergelock":{"command":"docker","args":["run","-i","--rm","ghcr.io/sadayamuthu/mergelock:0.1.5"]}}}

Cursor

{"mcpServers":{"mergelock":{"command":"docker","args":["run","-i","--rm","ghcr.io/sadayamuthu/mergelock:0.1.5"]}}}

VS Code

{"servers":{"mergelock":{"type":"stdio","command":"docker","args":["run","-i","--rm","ghcr.io/sadayamuthu/mergelock:0.1.5"]}}}

Runs on your computer with your permissions: check the package and its source before installing.

Browse

• GitHub tools
• GitHub and code hosting

Related MCP servers

• MiniMindsLab MCP Tools
  Deterministic MiniMindsLab utilities for AI agents over MCP.
• Cross-PR Combined-Tree Verification
  Your coding agents are isolated in worktrees; your breakage is not.
• Synergieloc Immobilier
  Draw buildings as DXF, IFC and 3D, plus exact French rent and charges calculations.
• Zovo Spreadsheet Compare
  Compare two spreadsheets
• Compose Preview Catalogs
  Browse, inspect and render Jetpack Compose Material 3 and Wear component catalogs.
• ALM X++ MCP Server
  D365 F&O: 90 AI tools over 200K+ objects, 25M+ cross-refs, 24M+ label translations.
• Diff Patch Tools
  Cloudflare Workers MCP server: diff-patch-tools
• Dayze — Life Context
  Life context for agents: get_context_pack + public notable packs. x402 + OAuth.

Badge for your README

[![AptLynx](https://aptlynx.net/badge/io.github.sadayamuthu/mergelock.svg)](https://aptlynx.net/servers/io.github.sadayamuthu/mergelock)

Listing text is written by the maker; AptLynx lists tools and does not vouch for them. Find another tool · Browse by topic · For agents