Skip to content
Agentmart
Submit a tool

mergelock

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

Connector by sadayamuthu · GitHub account verified by the MCP Registry

IndexedApache-2.0Local (stdio)
Write a review

Install

Works with Claude Code, Codex, VS Code, Cursor, Windsurf, Claude Desktop. Read the repository before you give any tool access to your data.

npx agentmarket install connector/sadayamuthu-mergelock

Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.

Get the weekly diff

The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.

We use your email only for this newsletter. Privacy

About

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

Reviews

Write a review

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this server can do and what it asks for, from its tool list and install config. Checked Oct 25, 2026.

Tools
2 read · 0 write · 0 deleteRead-only
Secrets
None asked for
Install scripts
Not scanned yet
Runs as
Docker image

Tools by what they do 2

Read from the source code; the running server may list different tools.

Read 2 · Look things up without changing anything.

  • check
  • claims

Tools (2)

Read from the source code; the running server may differ. Descriptions are the server’s own words; hidden characters are shown as [U+…].

  • checkCheck branches for merge conflicts

    Simulate merging two committed branches and report textual and semantic conflicts, including ones git merges cleanly: a changed function signature against new call sites, a deleted symbol that is still used, duplicate definitions. Returns a verdict with result clean, warnings or conflict, and per finding the file, line and a suggested_action to apply. Call it after committing and before reporting work as done; fix every error finding, commit, and call it again. Uncommitted changes are not seen. Use claims instead to see what other agents are working on before you start.

  • claimsList live work claims

    List live claims (work scopes other agents have declared: branch, paths, symbols, intent) from refs/mergelock/claims, newest first; expired claims are left out. Call it before starting a task to pick files and symbols no other agent is changing. It reports intent only; to find actual conflicts between branches, use check. Read-only in v0.1: claims cannot be created here.

Signals

Stars
0
Forks
1
Open issues
8
Last commit
Oct 17, 2026 (11 days ago)
Last release
Oct 16, 2026 (12 days ago)

From GitHub (fetched Oct 24, 2026).

Details

Registry name
io.github.sadayamuthu/mergelock
Version
0.1.5
Auth
No auth
Packages
oci ghcr.io/sadayamuthu/mergelock:0.1.5
License
Apache-2.0
Repository
github.com/sadayamuthu/mergelock
Website
github.com/sadayamuthu/mergelock
First seen
Oct 24, 2026
Last checked
Oct 24, 2026
Source
Official MCP Registrygithub-graphql
Cite this page

mergelock MCP server. Agent Mart. https://agentmart.dev/connectors/sadayamuthu-mergelock (last updated 2026-10-24)