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.
Cross-referenced across 55 tracked directories
#52236
Popularity Rank
1 / 55
Listed In
Emerging
Adoption Stage
9/9/2026
Created
1
GitHub Stars
10/25/2026
Last Commit
Recently added to the ecosystem
codeofaxel
3D printing infrastructure for AI agents — 430 MCP tools for OctoPrint, Moonraker, Bambu Lab, Prusa Link, and Elegoo
crunchtools.com
Secure MCP server for GitLab projects, merge requests, issues, and pipelines
therealchristhomas
MCP Server for GitLab API operations
ofershap
[glama](https://glama.ai/mcp/servers/ofershap/mcp-server-github-gist) 📇 ☁️ - Create, read, update, list, and search GitHub Gists from your IDE.
...more