Back to code-only MCP servers

Merge_conflict_resolver

active

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.

Code-only MCP server: no hosted endpoint, so you install and run it yourself. It is not probed, graded or counted in our reachability statistics.

Get it

Repository
github.com/srijaaa22/Merge_conflict_resolver
License
not declared
Last update
2026-10-25
GitHub stars
★ 1

Listed in

Run this server as a hosted endpoint? Submit the endpoint and it moves to the remote directory, where it is probed and graded.