mergelock runs on your own machine — the client starts it, so there is no endpoint to ping. Last commit 17 Oct 2026.
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
What the code does
We read the source, 7 d ago · rules 995398eba69f
What this server is able to do. For an MCP server this is often the job itself — a terminal server runs commands because that is what it is for. Listed so you know what you are plugging in, not as an accusation.
return filepath.Join(c.dir, adapter+"@"+version, blob[:2], blob+".gob")
Is this your server and something here is wrong? Tell us — corrections are free and do not require a plan.
This code can reach further than it looks
We found places where it runs commands, builds paths or queries from values it is given. None of that is a flaw by itself — it becomes one when the code changes, and code changes quietly between releases. We re-read it on every one.
Alternatives to mergelock
same job, measured the same wayDetects semantic merge conflicts between Git branches using AST-level analysis
Predict local Git merge-conflict pressure from branch topology and changed-file overlap without...
Public API surface diff between two versions: removed exports, signature changes, breaking list.
Convert times between zones, find shared working hours and meeting slots, check DST changes.
GitLab projects, branches, files, issues and merge requests via the GitLab REST API.
Local OKF tier check for Markdown folders: scan tiers, trust verdicts and git change reports.
Multi-agent coordination MCP: claim work, survey peers, resolve conflicts via a git branch as CAS.
Local Git via MCP: status, log, diff, file history, branches, and gated stage/commit. Pure-JS.
mergelock — questions
Answers built from our own checks of this server.