io.github.CloudCorpRecords/conflictfix
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
Servidor MCP · de CloudCorpRecords
Resumo
io.github.CloudCorpRecords/conflictfix é um servidor MCP publicado por CloudCorpRecords. Marketplaces que lemos e que o listam: 1 (Official MCP Registry). Vimos pela primeira vez em 2026-11-02 e não registramos mudanças desde então. Conforme nossa passagem pelos marketplaces em 2026-11-11.
O que pede
- Roda na sua máquina
Nenhum dos marketplaces que lemos publica as ferramentas ou as configurações que ele pede.
O que declara, pede e executa, por completo
Instale apenas plugins de desenvolvedores em quem você confia. Mostramos o que os marketplaces publicam e não testamos plugins.
Funciona com
- Claude Code
- Codex
- Cursor
- VS Code
- Copilot CLI
Um link de um clique abre o cliente, que pede confirmação antes de adicionar o servidor.
Pelos marketplaces que o listam e pelo transporte MCP que declara, conforme cada cliente documenta. Não testamos plugins.
Conectar
Comandos e configurações gerados apenas a partir do que os marketplaces declaram. Não os executamos por você e não testamos plugins.
Como servidor MCP local: pacote npm
Gerado a partir do que Official MCP Registry declara.
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"
]
}
}
}Onde está publicado
| Marketplace | Status | Versão | Números | Verificado | Visto pela primeira vez |
|---|---|---|---|---|---|
| Official MCP Registry (Abrir o registro) | Listado | 0.1.0 | Forks (GitHub): 0 Estrelas (GitHub): 0 |
Sem marcação |
Cada número é do próprio marketplace e nunca é somado entre marketplaces. Um marketplace que não publica números não mostra nenhum: sem número não é zero.
O que mudou
- Passou a ser um produto que acompanhamos
- Official MCP Registry: apareceu
Plugins semelhantes
Produtos cujos próprios nomes, descrições, ferramentas e skills são os mais próximos deste pelo significado, em todos os marketplaces que lemos. A proximidade é ordenada apenas dentro desta lista.
-
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.
Plugins semelhantes por marketplace
A mesma pergunta feita a cada marketplace separadamente: existe lá um equivalente deste plugin?
Listado em 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…
Listado em 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.
Listado em 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.
Listado em 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.
Listado em 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
Listado em 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.
Listado em 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.
Listado em 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.
Listado em 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.
Listado em 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.
Listado em 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
Listado em 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.
Encontrados pelo significado, não por código ou repositório em comum: plugins semelhantes continuam sendo produtos distintos, e isto não é uma avaliação nem uma recomendação.
Quer esta marca no seu plugin em nosso catálogo?
Prove que o mantém com um arquivo no repositório, um arquivo no seu domínio ou um registro DNS, e você poderá mostrar esta marca na ficha, com banners ao vivo para o seu site e o README. Como funciona a verificação
Você também recebe alertas quando um marketplace o publica, o remove, muda a marca de verificado ou o que ele pede, e o endpoint remoto passa a ser monitorado como um serviço web.
Dados de Official MCP Registry. Os números vêm das nossas próprias passagens regulares pelos marketplaces, última leitura em . Não publicamos dados de contato dos editores de plugins.