Git Conflict MCP
Enables detection and resolution of Git merge conflicts in repositories through MCP, providing tools to identify conflicting files and assist with conflict resolution workflows.
README
git-conflict-mcp
Usage / 使い方
via npx
You can run the server directly using npx. This requires no manual installation if you have Node.js installed.
npx -y git-conflict-mcp
MCP Configuration
Claude Desktop
You can add the server using the claude CLI:
claude mcp add git-conflict-mcp -- npx -y git-conflict-mcp
Or manually edit claude_desktop_config.json:
{
"mcpServers": {
"git-conflict-mcp": {
"command": "npx",
"args": ["-y", "git-conflict-mcp"]
}
}
}
Codex
You can add the server using the codex CLI:
codex mcp add git-conflict-mcp -- npx -y git-conflict-mcp
JSON Type (Generic)
{
"mcpServers": {
"git-conflict-mcp": {
"command": "npx",
"args": ["-y", "git-conflict-mcp"]
}
}
}
Development
To install dependencies:
npm install
To build:
npm run build
To run locally:
npm start
Recommended Servers
playwright-mcp
A Model Context Protocol server that enables LLMs to interact with web pages through structured accessibility snapshots without requiring vision models or screenshots.
Magic Component Platform (MCP)
An AI-powered tool that generates modern UI components from natural language descriptions, integrating with popular IDEs to streamline UI development workflow.
Audiense Insights MCP Server
Enables interaction with Audiense Insights accounts via the Model Context Protocol, facilitating the extraction and analysis of marketing insights and audience data including demographics, behavior, and influencer engagement.
VeyraX MCP
Single MCP tool to connect all your favorite tools: Gmail, Calendar and 40 more.
Kagi MCP Server
An MCP server that integrates Kagi search capabilities with Claude AI, enabling Claude to perform real-time web searches when answering questions that require up-to-date information.
graphlit-mcp-server
The Model Context Protocol (MCP) Server enables integration between MCP clients and the Graphlit service. Ingest anything from Slack to Gmail to podcast feeds, in addition to web crawling, into a Graphlit project - and then retrieve relevant contents from the MCP client.
Qdrant Server
This repository is an example of how to create a MCP server for Qdrant, a vector search engine.
Neon Database
MCP server for interacting with Neon Management API and databases
Exa Search
A Model Context Protocol (MCP) server lets AI assistants like Claude use the Exa AI Search API for web searches. This setup allows AI models to get real-time web information in a safe and controlled way.
E2B
Using MCP to run code via e2b.