MCP server
Conflictfix
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay…
Runs locallyStatus and history
- Pricing
- Open source
- Runs
- Locally
- Version
- 0.1.0
- Listing updated
- 6 days ago
About Conflictfix
Conflictfix is an open-source MCP server. It runs locally on your machine and is started by your AI client.
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
Install
Run in a terminal
claude mcp add conflictfix -- npx -y @reneturcios/conflictfixAdd to claude_desktop_config.json
{
"mcpServers": {
"conflictfix": {
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix"
]
}
}
}Install in CursorOpens Cursor, which asks you to confirm. Or add it by hand:
Add to ~/.cursor/mcp.json
{
"mcpServers": {
"conflictfix": {
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix"
]
}
}
}Install in VS CodeOpens VS Code, which asks you to confirm. Or add it by hand:
Add to .vscode/mcp.json
{
"servers": {
"conflictfix": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix"
]
}
}
}Add to ~/.codeium/windsurf/mcp_config.json
{
"mcpServers": {
"conflictfix": {
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix"
]
}
}
}Add to your client's MCP settings (most use this shape)
{
"mcpServers": {
"conflictfix": {
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix"
]
}
}
}Using several servers? Build one config file with the MCP config generator.
Pricing
Open source
Conflictfix FAQ
Is Conflictfix free?
Yes. Conflictfix is open source, so you can use and self-host it for free.
How do I add Conflictfix to Claude Code?
Run this command in your terminal: claude mcp add conflictfix -- npx -y @reneturcios/conflictfix
Where this comes from
- Description: from the official MCP Registry entry.
- Install steps: from the official MCP Registry entry.