Home › Version Control › mergelock
mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
Topics: Version Control
Connect
Review any command before running it. Package names and URLs come from the server's own registry entry.
Package (oci)
docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5
Or add to your MCP client config:
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}
This server takes extra arguments — see its repository.
Related servers
modelcontextprotocol/servers
Direct local file system access.
GitHub
Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language.
zereight/gitlab-mcp
GitLab MCP server for projects, merge requests, issues, pipelines, wiki, releases, and more.
mcp-server-azure-devops
Azure DevOps integration for repository management, work items and pipelines.
mcp-git-ingest
Read and analyze GitHub repositories.
GitWarren
Code review on your own machine, for you and your coding agent. Nothing leaves your computer.
Listed in punkpeye/awesome-mcp-servers (MIT)
Data from the Official MCP Registry