Git Conflict MCP
Rank #22635glama/mattyatea/git-conflict-mcp
Streamlines Git merge conflict resolution by providing structured tools for identifying conflicted files, reading conflict content, and marking conflicts as resolved without direct command-line interaction.
Git Conflict MCP is a Model Context Protocol (MCP) server published by mattyatea. It ranks #22635 of 58,900 servers tracked on MCP Toplist, and its repository has 4 GitHub stars. Git Conflict MCP is listed across 2 registries — Glama and PulseMCP, and ships as a single rolling release with no explicit version metadata. It was first listed on Dec 1, 2025.
Ranks ahead of 36,265 of 58,900 servers on MCP Toplist.
Use Git Conflict MCP
Git Conflict MCP doesn’t publish a machine-readable install config. Follow the setup instructions in its repository ↗, or open one of its registry listings above.
Listed on 2 registries
mattyatea
Not versioned
This server is published through registries that do not expose explicit version metadata, and no GitHub release tags were found on the linked repository. The listing tracks a single rolling release.
Frequently asked questions
- What is Git Conflict MCP?
- Streamlines Git merge conflict resolution by providing structured tools for identifying conflicted files, reading conflict content, and marking conflicts as resolved without direct command-line interaction.
- Who maintains Git Conflict MCP?
- Git Conflict MCP is maintained by mattyatea, which publishes 1 MCP server (0 total versions) tracked on MCP Toplist.
- Is Git Conflict MCP an official MCP server?
- 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?
- Git Conflict MCP ships as a single rolling release with no explicit version metadata.
- 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.