io.github.CloudCorpRecords/conflictfix

io.github.CloudCorpRecords/conflictfix

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

View repository →

Connect this server

Add this to your MCP client config — claude_desktop_config.json (Claude Desktop) or .cursor/mcp.json (Cursor).Suits: Claude Desktop · Cursor.

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

A starting point — check the repository for exact arguments and setup. Restart your client after editing the config.

Category
Developer Tools
Version
0.1.0
Registry
active
Published
11/2/2026

More Developer Tools servers

Browse all Developer Tools →

io.github.CloudCorpRecords/containerport

CloudCorpRecords

Run core Docker container operations: list, run, inspect, logs, images and volumes.

Developer ToolsAdded 1 week ago

io.github.CloudCorpRecords/contextbudget

CloudCorpRecords

Token budget auditor for agent context: per-file estimates, top offenders, exclusion advice.

Developer ToolsAdded 2 weeks ago

io.github.CloudCorpRecords/contribpath

CloudCorpRecords

Check a CONTRIBUTING document against the repo's actual contribution gates; report gaps.

Developer ToolsAdded 1 week ago

io.github.CloudCorpRecords/crmcloud

CloudCorpRecords

Salesforce org access: SOQL queries, SOSL search, SObject CRUD, limits, and user info.

Developer ToolsAdded 1 week ago

io.github.CloudCorpRecords/crmport

CloudCorpRecords

HubSpot CRM objects, properties, owners, and associations: list, search, write.

Developer ToolsAdded 1 week ago

io.github.CloudCorpRecords/cruisescope

CloudCorpRecords

Search cruises, check fares and price history, and look up cabins, ships, lines, ports.

Developer ToolsAdded 5 days ago

Add the badge to your site

Show visitors that io.github.CloudCorpRecords/conflictfix is listed here — it’s also the link we check for a free listing.

io.github.CloudCorpRecords/conflictfix — listed on Serverdex

HTML — for your website

<a href="https://serverdex.io/server/io-github-cloudcorprecords-conflictfix?utm_source=badge"><img src="https://serverdex.io/brand/badge.svg" alt="io.github.CloudCorpRecords/conflictfix — listed on Serverdex" width="123" height="40" loading="lazy"></a>

Recommended. A dofollow link from your own domain is the one that counts for search engines, and it's the link we check for a free listing.

Markdown — for your README

[![io.github.CloudCorpRecords/conflictfix — listed on Serverdex](https://serverdex.io/brand/badge.svg)](https://serverdex.io/server/io-github-cloudcorprecords-conflictfix?utm_source=badge)

Nice for visibility, but GitHub marks README links nofollow, so it doesn't pass authority. Use the HTML badge on your site as well.