shield_lock
JinDaGe
← Back to MCP directory
publicPublicdnsLocal runtime

git-conflict-mcp

一个用于处理Git冲突的MCP服务器工具，可通过npx直接运行或集成到Claude Desktop等开发环境中

article

README

🚀 git-conflict-mcp

git-conflict-mcp 是一个用于处理Git冲突的工具，通过便捷的配置和运行方式，帮助开发者更高效地解决代码冲突问题。

🚀 快速开始

通过npx运行

若你已安装Node.js，可直接使用 npx 运行该服务，无需手动安装。

npx -y git-conflict-mcp

📚 详细文档

MCP配置

Claude Desktop

可使用 claude CLI添加服务：

claude mcp add git-conflict-mcp -- npx -y git-conflict-mcp

或者手动编辑 claude_desktop_config.json 文件：

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

Codex

使用 codex CLI添加服务：

codex mcp add git-conflict-mcp -- npx -y git-conflict-mcp

JSON类型（通用）

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

开发相关

安装依赖

npm install

构建项目

npm run build

本地运行

npm start
help

Runtime guide

cloud

Hosted runtime

Hosted servers run from a provider-managed environment. You usually connect the MCP client to the hosted endpoint or follow the provider's authorization flow, without keeping a local process alive

  1. Open provider connection page
  2. Authorize or copy endpoint
  3. Connect from your MCP client
terminal

Local runtime / other methods

Local servers run on your own machine or infrastructure. You normally copy the server_config into your MCP client, install the required package, and provide env variables from env_schema when needed

  1. Copy server_config
  2. Install required package
  3. Fill env variables and restart client