Git Conflict MCP
Rank #19,208glama/mattyatea/git-conflict-mcp
Enables detection and resolution of Git merge conflicts in repositories through MCP, providing tools to identify conflicting files and assist with conflict resolution workflows.
Git Conflict MCP is a Model Context Protocol (MCP) server published by mattyatea. It ranks #19,208 of 132,046 servers tracked on MCP Toplist, and its repository has 5 GitHub stars. Git Conflict MCP is listed across 2 registries — Glama and PulseMCP, with 5 release tags tracked from its GitHub repository. It was first listed on Dec 1, 2025 and most recently updated on Dec 2, 2025.
Ranks ahead of 112,838 of 132,046 servers on MCP Toplist.
Use Git Conflict MCP
No credentials or required configuration declared — add it to your MCP client and go.
This server doesn't publish a machine-readable install config — see the repository README for install instructions.
Show your rank
Maintain this server? Add the live rank badge to your README — it updates automatically as the leaderboard changes.
[](https://mcptoplist.com/server/glama%2Fmattyatea%2Fgit-conflict-mcp)<a href="https://mcptoplist.com/server/glama%2Fmattyatea%2Fgit-conflict-mcp"><img src="https://mcptoplist.com/badge/glama%2Fmattyatea%2Fgit-conflict-mcp.svg" alt="MCP Toplist: Top 25% of 132,046" /></a>Variants: append ?metric=score or ?metric=stars to the image URL.
Listed on 2 registries
mattyatea
GitHub releases (5)
No registry surfaces explicit version metadata for this server. The list below shows release tags from the linked GitHub repository.
| Version | Published |
|---|---|
| v1.1.4 | Dec 2, 2025 |
| v1.1.3 | Dec 2, 2025 |
| v1.1.0 | Dec 2, 2025 |
| v1.1.1 | Dec 2, 2025 |
| v1.1.2 | Dec 2, 2025 |
Frequently asked questions
- Who maintains Git Conflict MCP?
- Git Conflict MCP is maintained by mattyatea, which publishes 1 MCP server (5 total versions) tracked on MCP Toplist.
- Is Git Conflict MCP listed on the Official MCP Registry?
- Git Conflict MCP is not on the Official MCP Registry. It is listed on Glama and PulseMCP.
- How many versions does Git Conflict MCP have?
- No registry surfaces explicit version metadata for Git Conflict MCP; MCP Toplist tracks 5 release tags from its GitHub repository, most recently published on Dec 2, 2025.
- Where can I find the source code for Git Conflict MCP?
- The source code for Git Conflict MCP is hosted at github.com/mattyatea/git-conflict-mcp.
Do you run this server?
Community projects list the MCP servers behind real agents and apps. Publish yours and this page will link to it.