mergelock MCP server

mergelock is a small checker that looks at two branches in your git project and points out problems git itself stays quiet about. It is handy if you work with other people on the same code and want to catch trouble before a merge, even if you are not the one writing the code.

What this MCP server does

You ask your AI something like whether your branch is safe to merge. The AI passes that request to the mergelock helper. The helper looks at the commits of both branches, without touching your files, and compares them. It then reports things like a function that changed on one side while the other side still calls the old version, or a function that was deleted but is still used. You get a short list of findings, each with a suggested fix.

What you can do with it

• Check if your branch is safe to merge into main
• Compare two branches that are both still in progress
• Spot a function whose signature changed while the other branch added calls to the old one
• Find a symbol that was deleted on one side but is still used on the other
• Catch the same function written twice on two branches
• Get a suggested fix for each problem found

Try asking your AI

• “Is my branch my-feature safe to merge into main?”
• “Compare feat-a and feat-b and tell me if they will collide.”
• “Run a mergelock check on my current branch against main and explain the findings.”
• “Are there any hidden conflicts between my branch and main before I push?”

What it gives back to you

You get a short report in the chat. It lists each finding with a severity, like error or warning, and a suggested fix. If everything is fine, it simply tells you the result is clean. Nothing in your files is changed.

Before you start

Who it's for

Developers and teams who work on shared code and want a quick safety check before merging branches, especially when several people or AI agents edit the same project.

Jobs it suits