Loading…
MCP server that lets Claude Desktop and other MCP hosts analyze and resolve Git merge conflicts, with the host model reasoning over each hunk directly. Also ships a FastAPI REST API with Gemini-backed smart resolution. Shared services layer, session-scoped history, hardened parser.
Merge_conflict_resolver is an MCP server entry in ChatHome Skills, sourced from GitHub MCP Search and scored 45/100. MCP server that lets Claude Desktop and other MCP hosts analyze and resolve Git merge conflicts, with the host model reasoning over each hunk directly. Also shi. As a Model Context Protocol server, it exposes tools that MCP-compatible LLM clients such as Claude, Cursor, and Copilot can call directly, extending an agent's reach beyond its built-in capabilities. ChatHome Skills discovered this entry through its daily ingest of official registries and GitHub discovery queries, and re-verifies repository facts, freshness signals, and install metadata on every run. The quality score weighs official-registry presence, a working install command, license clarity, GitHub star trajectory, and repository freshness — the full formula is on the Sources page. The install command above is ready to copy. Review the last-pushed date and repository status before adding Merge_conflict_resolver to a production agent workflow; the snapshot facts below are point-in-time values from the most recent ingest.
git clone https://github.com/srijaaa22/Merge_conflict_resolver.gitReview the upstream source before running this command.
Scan coverage: Install metadata and repository README.
Automated signals from install metadata and a bounded skill body — not a full code security audit and not a recursive source or dependency review.
{
"fullName": "srijaaa22/Merge_conflict_resolver"
}MCP server that lets Claude Desktop and other MCP hosts analyze and resolve Git merge conflicts, with the host model reasoning over each hunk directly. Also ships a FastAPI REST API with Gemini-backed smart resolution. Shared services layer, session-scoped history, hardened parser.