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…
Plugin bundle · by iowarp
About
resolve-merge-conflicts is a plugin bundle for AI coding tools published by iowarp. Marketplaces we read that list it: 1 (Community GitHub marketplaces). We first saw it on 2026-10-13 and have recorded no change since. As of our marketplace pass on 2026-10-13.
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.
What it asks for
- Installs as a plugin bundle
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
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 Claude Code plugin
Built from what Community GitHub marketplaces declares.
/plugin marketplace add iowarp/clio-kit
/plugin install resolve-merge-conflicts@clio-kitWhere it is published
| Marketplace | Status | Version | Figures | Verified | First seen |
|---|---|---|---|---|---|
| Community marketplace iowarp/clio-kit (Open the source on GitHub) | Listed | 0.4.0 | Forks (GitHub): 5 Stars (GitHub): 8 |
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.
Listed in one community marketplace
| Marketplace | Repository | Stars (GitHub) |
|---|---|---|
| clio-kit | iowarp/clio-kit | 29 |
What changed
- Became a product we track
- Community GitHub marketplaces: 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 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.
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…
-
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…
Has a listing on 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…
Has a listing on 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
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.
-
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.
Has a listing on 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…
Has a listing on 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…
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.
-
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.
Has a listing on 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…
Has a listing on 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.
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 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.
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.
Is this your plugin?
Add it to your projects and prove you maintain it with a file in its repository, a file on your domain or a DNS record. You 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 public marketplace files in GitHub repositories of their authors. Figures come from our own regular passes over the marketplaces, last read on . We publish no contact details for plugin publishers.