Armory
Source
Browse
MCPs

mattyatea-git-conflict

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.

Score
46.6541 signal
Evidence
5 stars
Last commit
as last read from GitHub; most reads are from 2 Sep 2026 or later
Listed

Install

No one-command install. Set it up from its source.

Alternatives · MCPs

  1. xgenerationlab-xiyan-mysql242 stars · 48 forks95.189
  2. video-creator-ffmpeg145 stars · 23 forks92.785
  3. mcp-gitwand167 stars · 7 forks89.964

What it is

MCP server Git Conflict Manager, catalogued on PulseMCP. 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.

When to use it

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.

Notes

Listed from the PulseMCP registry. The registry does not state a license. Check it before production use.