Koskamo

conflictfix MCP

Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual. The tool triages three-way merge conflicts by analyzing base, ours, and theirs lines to determine if a resolution is safe to apply automatically.

Package and access

Local package with source-attributed installation metadata. Koskamo does not execute packages during review.

conflictfix MCP logo, by CloudCorpRecordsCommunity listingLocal stdioSource reviewed; not executedPublished by CloudCorpRecords
Vendor documentation

What you can do with it

  • Triage three-way merge conflicts
  • Classify hunks as safe or risky
  • Identify safe mechanical resolutions

Source and maintenance

Community listingRegistry 0.1.0
mcp-registry: io.github.CloudCorpRecords/conflictfix@0.1.0Source repository
Maintenance checked

Packages and installation

Source-provided package data. Koskamo has not executed or live-probed this package.

@reneturcios/conflictfix 0.1.0

npmnpx
@reneturcios/conflictfix package definition
{
  "version": "0.1.0",
  "transport": "stdio",
  "identifier": "@reneturcios/conflictfix",
  "runtimeHint": "npx",
  "registryType": "npm",
  "registryBaseUrl": "https://registry.npmjs.org",
  "packageArguments": [
    {
      "type": "positional",
      "value": "mcp"
    }
  ]
}

Tools

Reported by the attributed source; not independently observed by Koskamo.

No tool definitions available.

Connect from your client

Each snippet configures the same source-provided package; replace placeholders before use.

This server is operated by the named third party. Listing and endpoint checks are not an endorsement or a security audit. Review the operator's permissions, terms, and data handling before connecting. How listings are checked and corrected.

Cursor

Merge this local stdio configuration, replace every placeholder environment value, and restart Cursor. Koskamo has not executed this package.
Cursor configuration
{
  "mcpServers": {
    "conflictfix-mcp": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix@0.1.0",
        "mcp"
      ]
    }
  }
}

Cline

Merge this local stdio configuration, replace every placeholder environment value, and restart Cline. Koskamo has not executed this package.
Cline configuration
{
  "mcpServers": {
    "conflictfix-mcp": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix@0.1.0",
        "mcp"
      ]
    }
  }
}

VS Code

Merge this local stdio configuration, replace every placeholder environment value, and restart VS Code. Koskamo has not executed this package.
VS Code configuration
{
  "servers": {
    "conflictfix-mcp": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix@0.1.0",
        "mcp"
      ]
    }
  }
}

Claude Desktop

Merge this local stdio configuration, replace every placeholder environment value, and restart Claude Desktop. Koskamo has not executed this package.
Claude Desktop configuration
{
  "mcpServers": {
    "conflictfix-mcp": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix@0.1.0",
        "mcp"
      ]
    }
  }
}

Let your agent find its tools

Find servers like conflictfix MCP from your agent. Add Koskamo once to search the index for endpoints, access requirements, and client setup. Public discovery needs no key.

Connect Koskamo Explore workflows
See all 9,399