git-conflict-mcp

Installation / インストール

English

You can easily install the latest version using the install.sh script. This will download the appropriate binary for your platform from the latest GitHub Release.

curl -fsSL https://raw.githubusercontent.com/mattyatea/git-conflict-mcp/main/install.sh | bash

After running the script, follow the instructions to move the binary to your executable path (e.g., /usr/local/bin).

日本語

install.sh スクリプトを使用して、最新バージョンを簡単にインストールできます。このスクリプトは、GitHubの最新リリースからプラットフォームに適したバイナリをダウンロードします。

curl -fsSL https://raw.githubusercontent.com/mattyatea/git-conflict-mcp/main/install.sh | bash

スクリプトの実行後、表示される指示に従ってバイナリを実行パス（例: /usr/local/bin）に移動してください。

Development

To install dependencies:

bun install

To run:

bun run index.ts

This project was created using bun init in bun v1.2.9. Bun is a fast all-in-one JavaScript runtime.

MCP Configuration

Claude Desktop

You can add the server using the claude CLI:

claude mcp add git-conflict-mcp -- /usr/local/bin/git-conflict-mcp

Or manually edit ~/Library/Application Support/Claude/claude_desktop_config.json:

{ "mcpServers": { "git-conflict-mcp": { "command": "/usr/local/bin/git-conflict-mcp", "args": [] } } }

Codex

You can add the server using the codex CLI:

codex mcp add git-conflict-mcp -- git-conflict-mcp

Or manually edit ~/.codex/config.toml:

[mcp_servers.git-conflict-mcp] command = "git-conflict-mcp" args = []

JSON Type (Generic)

Use this configuration for clients that support JSON config.

{ "mcpServers": { "git-conflict-mcp": { "command": "git-conflict-mcp", "args": [] } } }

This server cannot be installed

-

security - not tested

A

license - permissive license

-

quality - not tested

How are these scores calculated?

Resources

GitHub Repository

Need Help?

Report Issue

Related Servers

Git Conflict MCP