conflicts

Level FSource

Merge conflict parser MCP tool. Structured JSON output from git conflict markers

⭐ 0Development ToolsGoRepo ↗Updated 2026-03-05

Installation

View source repo →

Related servers

tui-test-ghostSame author⭐ 2 · Development ToolsZig-native TUI testing toolkit built on Ghostty's terminal emulation corecheckforSame author⭐ 0 · Search & InfoToken-efficient file search tool with JSON output and MCP server supportREA⭐ 418.8k · Development Tools逆向工程一体化 MCP：把 Ghidra、IDA、Hopper、JADX、Frida、ADB、浏览器等工具统一封装，Agent 无需源码即可分析二进制、App、gemini-cli⭐ 108.7k · Development ToolsAn open-source AI agent that brings the power of Gemini directly into your termiawesome-mcp-servers⭐ 97.3k · Development ToolsA collection of MCP servers.cline⭐ 71.4k · Development ToolsAutonomous coding agent as an SDK, IDE extension, or CLI assistant.