io.github.CloudCorpRecords/conflictfix
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
MCP server · by CloudCorpRecords
About
io.github.CloudCorpRecords/conflictfix is an MCP server published by CloudCorpRecords. Marketplaces we read that list it: 1 (Official MCP Registry). We first saw it on 2026-11-02 and have recorded no change since. As of our marketplace pass on 2026-11-11.
What it asks for
- Runs on your machine
None of the marketplaces we read publishes its tools or the settings it asks for.
What it declares, asks for and runs, in full
Only install plugins from developers you trust. We list what marketplaces publish and do not test plugins.
Works with
- Claude Code
- Codex
- Cursor
- VS Code
- Copilot CLI
A one-click link opens the client, which asks you to confirm before it adds the server.
From the marketplaces that list it and the MCP transport it declares, as each client documents them. We do not test plugins.
Connect
Commands and configs built only from what its marketplaces declare. We do not run them for you and do not test plugins.
As a local MCP server: npm package
Built from what Official MCP Registry declares.
claude mcp add --transport stdio conflictfix -- npx -y @reneturcios/conflictfix mcp[mcp_servers.conflictfix]
command = "npx"
args = ["-y", "@reneturcios/conflictfix", "mcp"]{
"mcpServers": {
"conflictfix": {
"command": "npx",
"args": [
"-y",
"@reneturcios/conflictfix",
"mcp"
]
}
}
}Where it is published
| Marketplace | Status | Version | Figures | Verified | First seen |
|---|---|---|---|---|---|
| Official MCP Registry (Open the registry record) | Listed | 0.1.0 | Forks (GitHub): 0 Stars (GitHub): 0 |
Not marked |
Each figure is the marketplace's own and is never added up across marketplaces. A marketplace that publishes no figure shows none: no number is not zero.
What changed
- Became a product we track
- Official MCP Registry: appeared
Similar plugins
Products whose own names, descriptions, tools and skills are closest in meaning to this one, on every marketplace we read. Closeness is ranked within this list only.
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
merge-conflict-forecaster-mcp io.github.mrfentmen/merge-conflict-forecaster-mcp
Predict local Git merge-conflict pressure fro MCP: real tools for real work.
-
GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
-
Local-first code context, impact analysis, and merge-readiness verdicts for AI agents.
-
The official Letmediff MCP server helping you review your code with an agent first workflow
-
GitWhy — The Context Layer for Git
The shared AI context engine for git — save, search, and share the reasoning behind code changes.
-
git-enhanced io.github.davidweb3-ctrl/git-enhanced
Enhanced Git MCP Server - Code review, commit analysis, and branch management
-
Detect merge conflicts across git worktrees before they happen. Warns before writing to files that would cause merge conflicts when running multiple AI agents in parallel.
Similar plugins by marketplace
The same question asked of one marketplace at a time: is there an analog of this plugin there?
Has a listing on Claude Code: claude-plugins-community (5)
-
Two skills in one plugin: (1) Automated git bisect for regression hunting — establishes boundaries, runs `git bisect run` with reproduction commands, analyzes the culprit commit…
-
Self-hosted GitHub MCP server. PAT auth, stdio transport, transport-agnostic so it works with…
-
Claude Code plugin to detect AI slop PRs — placeholder tests, overcommented code, and hallucinated changes. Free Layer 1 + optional LLM judge.
-
Scan Git commits for security vulnerabilities using Almanax directly from Claude Code. The plugin connects to the Almanax MCP server to analyze commit diffs, surface findings by…
-
Code review with any AI model via OpenRouter. Run standard and adversarial reviews against your working tree or branch using Claude, GPT, Gemini, Llama, or any other model…
Has a listing on Claude Code: claude-plugins-official (5)
-
Official GitHub MCP server for repository management. Create issues, manage pull requests, review code, search repositories, and interact with GitHub's full API directly from…
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
Upstash Context7 MCP server for up-to-date documentation lookup. Connects to Context7's hosted remote MCP server (https://mcp.context7.com/mcp) — no local Node.js or npx required…
-
AI code review agent for GitHub and GitLab. View and resolve Greptile's PR review comments, run reviews on your working branch, and search your organization's knowledge base and…
-
Analyze codebases and recommend tailored Claude Code automations such as hooks, skills, MCP servers, and subagents.
Has a listing on Claude: knowledge-work-plugins (5)
-
Bring Qodo's codebase intelligence, coding standards, and code review into your coding agent.
-
gk-cli com.gitkraken/gk-cli
The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.
-
MCP server for terminal commands, file operations, and process management
-
Security review for Claude-generated code. Pattern-based warnings on edits, LLM-powered diff review on Stop, and an agentic commit reviewer that catches injection, XSS, SSRF…
-
Streamline engineering workflows — standups, code review, architecture decisions, incident response, and technical documentation. Works with your existing tools or standalone.
Has a listing on Codex: openai-curated (openai/plugins) (5)
-
Inspect repositories, triage pull requests and issues, debug CI, and publish changes through a hybrid GitHub connector and CLI workflow.
-
AI-powered code review in Codex, powered by CodeRabbit.
-
Qodo setup, code intelligence, and review workflows.
-
Inspect recent issues and events in Sentry from Codex.
-
Evaluate Codex skills and plugins from chat with a beginner-friendly start command, local-first reports, token budget explanations, and guided benchmarking.
Has a listing on Community GitHub marketplaces (5)
-
Detect merge conflicts across git worktrees before they happen. Warns before writing to files that would cause merge conflicts when running multiple AI agents in parallel.
-
Git strategies, merge conflicts, and advanced version control expert
-
Surgical, non-interactive git hunk control for AI agents
-
Fetches and fixes unresolved PR comments by automatically retrieving feedback, addressing reviewer concerns, making targeted code improvements, and streamlining the review process.
-
Advanced git workflows with diff analysis, risk scoring, and reviewer recommendations
Has a listing on Copilot CLI: github/awesome-copilot (5)
-
Split an existing large branch into smaller stacked PRs on GitHub, Azure DevOps or GitLab, and manage the branches as PRs are merged.
-
Visualize and guide the GitHub Copilot Modernize CLI Assess, Plan, and Execute workflow for .NET, Java, and C++ application repositories.
-
Review GitHub pull requests in a read-only canvas with AI-grouped changes, expandable diffs, and questions scoped to groups, files, or hunks.
-
Analyze any repository and generate AI-ready configuration — AGENTS.md, copilot-instructions.md, CI workflows, issue templates, and more. Mines your PR review patterns and creates…
-
Generic cross-repo command center canvas for GitHub Copilot with onboarding, focus planning, repo health, work signals, and session cleanup.
Has a listing on Copilot CLI: github/copilot-plugins (5)
-
Bring Azure DevOps work-item, repository, and pull-request workflows into GitHub Copilot.
-
Advanced Security plugin for GitHub Copilot.
-
Toolkit for building Microsoft 365 Copilot declarative agents — scaffolding, JSON manifest development, and capability configuration.
-
Navigate and interact with your C++ code using the Microsoft C++ Language Server.
-
Build Power Apps Canvas Apps using the Canvas Authoring MCP server.
Has a listing on Cursor: cursor/plugins (5)
-
Manage repos, issues, pull requests, and Actions.
-
Skills for building on the Cursor Origin API. Fetch the live spec first, then follow the Origin rules for credentials, scopes, webhooks, paging, and errors. Includes a skill that…
-
Render PR diffs as review canvases grouped by importance.
-
Internal team workflows for CI, code review, shipping, local automation, and verification.
-
CLI-backed repo compatibility scans plus agents that audit startup, validation, and docs against reality.
Has a listing on Docker MCP Catalog (5)
-
Git repository interaction and automation.
-
Tools for interacting with Git repositories.
-
Stop stitching context for Copilot and Cursor. With Sequa MCP, your AI tools know your entire codebase and docs out of the box.
-
MCP Server for the GitLab API, enabling project management, file operations, and more.
-
Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language.
Has a listing on Official MCP Registry (5)
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
merge-conflict-forecaster-mcp io.github.mrfentmen/merge-conflict-forecaster-mcp
Predict local Git merge-conflict pressure fro MCP: real tools for real work.
-
GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
Has a listing on PyPI (MCP servers) (5)
-
A code intelligence graph that gives AI coding agents deep, token-efficient understanding of your codebase.
-
memex io.github.STiFLeR7/memex
Temporal engineering context for agents via MCP.
-
Git repository interaction and automation.
-
MCP server for Bitbucket Data Center — code search, file browsing, PRs, commits, and more.
-
Local repository intelligence for coding agents
Has a listing on npm registry (MCP servers) (5)
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
git-mcp-server io.github.cyanheads/git-mcp-server
Comprehensive Git MCP server enabling native git tools including clone, commit, worktree, & more.
-
speclock io.github.sgroy10/speclock
AI Constraint Engine — enforces CLAUDE.md and .cursorrules as laws. 51 MCP tools.
-
Local MCP server that audits your git changes against the repo's own AI rules (AGENTS.md, CLAUDE.md, .cursorrules, Copilot, Kiro, skills) and returns a compliance table or an HTML…
-
Octocode MCP - AI Context Platform
AI code research platform. Search, analyze, and extract insights from any GitHub repository.
Found by meaning, not by shared code or a shared repository: similar plugins stay separate products, and this is not a review or a recommendation.
Want this mark on your plugin in our catalog?
Prove you maintain it with a file in its repository, a file on your domain or a DNS record, and you can show this mark on the card, with live banners for your site and README. How verification works
You also get alerts when a marketplace lists it, drops it, changes its verified mark or what it asks for, and its remote endpoint goes on monitoring as a web service.
Data comes from the Official MCP Registry (registry.modelcontextprotocol.io), CC0 1.0. Figures come from our own regular passes over the marketplaces, last read on . We publish no contact details for plugin publishers.