Global (EN)
Setup GuideSaved Tools
Back to All MCP Servers
G

Git Conflict

Verified Integration
Author: @mattyatea•Category: ServerApplication
GitHub Repository
JSON-RPC 2.0
Protocol Standard
Sub-second
Execution Latency
Active
Operational Status
Tags:#Claude#Search#Database#API#Git#AI#GitHub#Node.js

Client Configuration

— Connect Git Conflict to Claude Desktop or Cursor in seconds
{
  "mcpServers": {
    "git-conflict": {
      "command": "npx",
      "args": [
        "deployment"
      ],
      "env": {}
    }
  }
}
Paste into ~/Library/Application Support/Claude/claude_desktop_config.json (macOS) or %APPDATA%\Claude\claude_desktop_config.json (Windows).
Architecture & Capabilities

System Overview

Provides a server interface for integrating Git conflict resolution assistance with various development tools.

Indexed Date

7/23/2026

License

Open Source

Protocol Layer

stdio / SSE RPC

Frequently Asked Questions

Architecture and operational details for Git Conflict

Git Conflict is a server interface designed to provide Git conflict resolution assistance. It integrates with various development tools as a dedicated Multi-Channel Protocol (MCP) endpoint, helping streamline the conflict resolution process.

Related MCP Servers

Browse all servers →
C
@carboneio
Carbone

Empower AI assistants to generate and convert documents, manage templates, and automate document workflows efficiently.

ClaudeSearchDatabase+65 FAQs
Learn more
C
@sebastienrousseau
CloudCDN

Provides a multi-tenant, AI-native Content Delivery Network deployable on Cloudflare, featuring sub-100ms TTFB, AI agent controllability, and comprehensive accessibility.

ClaudeSearchDatabase+65 FAQs
Learn more
C

Deploy a Model Context Protocol server on Cloudflare Workers without requiring authentication.

ClaudeSearchDatabase+55 FAQs
Learn more