resolve-merge-conflicts
Resolves a merge, rebase, or cherry-pick stopped on conflicts by reconstructing both sides' intent, validating with the project's own checks, and completing the operation. Not for…
Paquete de plugins · de iowarp
Resumen
resolve-merge-conflicts es un paquete de plugins para herramientas de programación con IA publicado por iowarp. Marketplaces que leemos y que lo publican: 1 (Community GitHub marketplaces). Lo vimos por primera vez el 2026-10-13 y desde entonces no hemos registrado cambios. Según nuestra pasada por los marketplaces del 2026-10-14.
Resolves a merge, rebase, or cherry-pick stopped on conflicts by reconstructing both sides' intent, validating with the project's own checks, and completing the operation. Not for integrating many branches; use worktree-merge.
Qué pide
- Se instala como paquete de plugins
Ninguno de los marketplaces que leemos publica sus herramientas ni los ajustes que pide.
Lo que declara, pide y ejecuta, completo
Instala solo plugins de desarrolladores en los que confíes. Mostramos lo que publican los marketplaces y no probamos plugins.
Funciona con
- Claude Code
Según los marketplaces que lo listan y el transporte MCP que declara, tal como lo documenta cada cliente. No probamos plugins.
Conectar
Comandos y configuraciones generados solo a partir de lo que declaran sus marketplaces. No los ejecutamos por ti ni probamos plugins.
Como plugin de Claude Code
Generado a partir de lo que declara Community GitHub marketplaces.
/plugin marketplace add iowarp/clio-kit
/plugin install resolve-merge-conflicts@clio-kitDónde está publicado
| Marketplace | Estado | Versión | Cifras | Verificado | Visto por primera vez |
|---|---|---|---|---|---|
| Marketplace de la comunidad iowarp/clio-kit (Abrir el código en GitHub) | Publicado | 0.4.0 | Forks (GitHub): 5 Estrellas (GitHub): 8 |
Sin marca |
Cada cifra es del propio marketplace y nunca se suma entre marketplaces. Un marketplace que no publica cifras no muestra ninguna: sin número no es cero.
Figura en un marketplace de la comunidad
| Marketplace | Repositorio | Estrellas (GitHub) |
|---|---|---|
| clio-kit | iowarp/clio-kit | 29 |
Qué cambió
- Pasó a ser un producto que seguimos
- Community GitHub marketplaces: apareció
Plugins similares
Productos cuyos propios nombres, descripciones, herramientas y skills son los más cercanos a este por su significado, en todos los marketplaces que leemos. La cercanía se ordena solo dentro de esta 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 from branch topology and changed-file overlap without...
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
Integrates finished worktree branches through one throwaway integration branch, testing after each merge and running the full suite before the main line moves, with exact rollback…
-
Local Git via MCP: status, log, diff, file history, branches, and gated stage/commit. Pure-JS.
-
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…
-
Reconstruct your dev context (branch, commits, uncommitted work, PR clues) and trigger a resume prompt to continue quickly.
-
Group your AI's changes into focused commit candidates; nothing lands until you approve.
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
GitWhy — The Context Layer for Git
The shared AI context engine for git — save, search, and share the reasoning behind code changes.
Plugins similares por marketplace
La misma pregunta a cada marketplace por separado: ¿hay allí un equivalente de este plugin?
Publicado en 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…
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
Create a git commit, automatically generate commit messages based on [Google Engineering Practices - CL…
-
Automatically discover and clean up stale session artifacts (git worktrees, dangling refs) to reclaim disk space
-
Six focused slash commands for safer, more deliberate coding sessions. Save and restore named git checkpoints, review diffs before committing, analyze blast radius before changing…
Publicado en Claude Code: claude-plugins-official (5)
-
Skills for the Mergify CLI: manage merge queues, stacked pull requests, Test Insights (flaky tests, quarantine), merge protections, and Mergify configuration directly from the…
-
Commands for git commit workflows including commit, push, and PR creation
-
gk-cli com.gitkraken/gk-cli
The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.
-
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…
-
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…
Publicado en Claude: knowledge-work-plugins (5)
-
gk-cli com.gitkraken/gk-cli
The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.
-
Bring Qodo's codebase intelligence, coding standards, and code review into your coding agent.
-
Streamline engineering workflows — standups, code review, architecture decisions, incident response, and technical documentation. Works with your existing tools or standalone.
-
Keep your coding agent up to date with the latest web best practices
-
MCP server for terminal commands, file operations, and process management
Publicado en 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.
-
Qodo setup, code intelligence, and review workflows.
-
AI-powered code review in Codex, powered by CodeRabbit.
-
An agentic skills framework & software development methodology that works: planning, TDD, debugging, and collaboration workflows.
-
Inspect recent issues and events in Sentry from Codex.
Publicado en Community GitHub marketplaces (5)
-
Integrates finished worktree branches through one throwaway integration branch, testing after each merge and running the full suite before the main line moves, with exact rollback…
-
Local Git via MCP: status, log, diff, file history, branches, and gated stage/commit. Pure-JS.
-
Resolves a tracker issue end to end: fetches it, diagnoses only when the issue does not name the code, fixes test-first, and self-reviews against the acceptance criteria, leaving…
-
Declare plans before writing code, share memory between agents, and let humans rule on conflicts once. Adds the Consensus MCP server, a hook that refuses edits until the plan is…
-
Ships finished work: writes one reviewed atomic commit, keeps maintainer branches local, or pushes a contributor branch to their fork and opens a PR only on explicit intent. Not…
Publicado en Copilot CLI: github/awesome-copilot (5)
-
Reconstruct your dev context (branch, commits, uncommitted work, PR clues) and trigger a resume prompt to continue quickly.
-
Visualize the active Git repository through worktrees, branches, commits, and optional GitHub pull request context.
-
Generic cross-repo command center canvas for GitHub Copilot with onboarding, focus planning, repo health, work signals, and session cleanup.
-
Review GitHub pull requests in a read-only canvas with AI-grouped changes, expandable diffs, and questions scoped to groups, files, or hunks.
-
Goal-driven task orchestration with independent verification. Interviews the user to define a clear goal, then loops between a Builder subagent (does the work) and an Inspector…
Publicado en 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.
-
Navigate and interact with your C++ code using the Microsoft C++ Language Server.
-
Toolkit for building Microsoft 365 Copilot declarative agents — scaffolding, JSON manifest development, and capability configuration.
-
workiq
Query Microsoft 365 data with natural language — emails, meetings, documents, Teams messages, and more.
Publicado en Cursor: cursor/plugins (5)
-
Internal team workflows for CI, code review, shipping, local automation, and verification.
-
Manage repos, issues, pull requests, and Actions.
-
Render PR diffs as review canvases grouped by importance.
-
if you want to go fast, go deep first. pstack helps you write less, but higher quality code. rigorous agent workflows you can parallelize with confidence.
-
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…
Publicado en Docker MCP Catalog (5)
-
Git repository interaction and automation.
-
Tools for interacting with Git repositories.
-
Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language.
-
MCP Server for the GitLab API, enabling project management, file operations, and more.
-
Tools for interacting with the GitHub API, enabling file operations, repository management, search functionality, and more.
Publicado en 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 from branch topology and changed-file overlap without...
-
semamerge io.github.vineethwilson15/semamerge
Detects semantic merge conflicts between Git branches using AST-level analysis
-
Local Git via MCP: status, log, diff, file history, branches, and gated stage/commit. Pure-JS.
-
Group your AI's changes into focused commit candidates; nothing lands until you approve.
Encontrados por significado, no por código ni repositorio compartidos: los plugins similares siguen siendo productos distintos, y esto no es una reseña ni una recomendación.
¿Es tu plugin?
Añádelo a tus proyectos y demuestra que lo mantienes con un archivo en su repositorio, un archivo en tu dominio o un registro DNS. Recibirás avisos cuando un marketplace lo publique, lo retire, cambie su marca verificada o lo que pide, y su endpoint remoto quedará monitorizado como un servicio web.
Datos de Community GitHub marketplaces. Las cifras proceden de nuestros propios recorridos periódicos por los marketplaces, leída por última vez el . No publicamos datos de contacto de los editores de plugins.