Conflictfix MCP Server

by cloudcorprecords Your server? Claim it

local only

Conflictfix runs on your own machine — the client starts it, so there is no endpoint to ping. 297 installs a week from npm. Last commit 3 Nov 2026.

Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.

Installs per day peak 188 · avg 9

a month agotoday

297

Installs / week

npm · @reneturcios/conflictfix

Stars

0 open issues

3 Nov 2026

Last commit

2 releases in 90 days

MIT

License

TypeScript

Nothing serious here today

Today is the operative word: we check Conflictfix every 15 minutes and re-read its code on every release. Watch it and you find out the day that stops being true.

Connect this server

This server runs on your own machine — install it with the package manager and the client starts it for you. Package name taken from the official registry entry.

Claude Code Claude Desktop Codex Cursor VS Code

run in your terminal

claude mcp add conflictfix -- npx -y @reneturcios/conflictfix

~/Library/Application Support/Claude/claude_desktop_config.json

{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}

~/.codex/config.toml

[mcp_servers.conflictfix]
command = "npx"
args = ["-y", "@reneturcios/conflictfix"]

.cursor/mcp.json

{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}

.vscode/mcp.json

{
  "servers": {
    "conflictfix": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}

Alternatives to Conflictfix

same job, measured the same way

Safe Merchant Solutions Assistant

by safemerchantsolutions-walnbot

Safe Merchant Solutions assistant: search services and knowledge, and request a contact.

5 tools answering

Gitwand

by devlint

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

362 installs/wk local only

GenPark Git Semantic Cherry-Pick Conflict Resolver

by alphaparkinc

Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks

local only

Peerconflict

by cloudcorprecords

Explains peer-dependency conflicts as a graph and suggests the least-change resolution.

292 installs/wk local only

Merchant Context

by ihint

Resolve sourced merchant facts and safe actions before an agent acts.

9 tools answering

Fdarecords

by cloudcorprecords

openFDA identifier resolution: drug labels and applications, device submissions, classification.

289 installs/wk local only

Retry-outcome resolution dedup proxy

by textforagents

Dedup proxy: claim-before-execute, UNKNOWN resolution, CONFLICT and ESCALATED refusal.

4 tools answering

Skarn

by getskarn

Scans AI coding sessions and assistant configs for leaked secrets and risky hooks; local, redacted

287 installs/wk local only

Conflictfix — questions

Answers built from our own checks of this server.

Why is there no uptime for Conflictfix?

Conflictfix runs on your own machine over stdio — there is no network address to reach, so uptime cannot be measured for it by anyone. What can be measured is adoption: the npm package @reneturcios/conflictfix was installed 297 times last week.

How do I connect Conflictfix?

Copy the ready config from this page. We generate it for Claude Code, Claude Desktop, Codex, Cursor and VS Code, each in the form that client actually reads. It runs locally, so the command pulls @reneturcios/conflictfix straight from npm; nothing to host, nothing to sign up for.

How many people use Conflictfix?

The npm package @reneturcios/conflictfix was installed 297 times in the last week. We show installs rather than GitHub stars on purpose: a star is a bookmark, an install is someone actually running it.

Is Conflictfix open source?

Yes — it is published under the MIT licence, written in TypeScript and 0 stars on GitHub. The source link is on this page, so you can read exactly what it does with your data before you connect it.