resolve-merge-conflicts vs Desktop Commander
resolve-merge-conflicts is no longer listed on any marketplace we read: these are its last known data, as of 2026‑10‑23.
resolve-merge-conflicts is a plugin bundle for AI coding tools published by iowarp. No marketplace we read lists it any more. Desktop Commander is an MCP server published by wonderwhy-er. Marketplaces we read that list it: 7 (Official MCP Registry, Claude Code: claude-plugins-official, Docker MCP Catalog, Claude: knowledge-work-plugins, Claude Code: claude-plugins-community, Community GitHub marketplaces, npm registry (MCP servers)). As of our marketplace pass on 2026-11-14. A plugin in this pair is no longer listed on any marketplace we read, so search engines are asked not to index the page.
Where each is published
| Marketplace |   Desktop Commander | |
|---|---|---|
| Community marketplace iowarp/clio-kit | Removed on 2026-10-16 Version: 0.4.0 Forks (GitHub): 5 Stars (GitHub): 8 Not marked · First seen |
Not listed |
| Community marketplace iowarp/clio-coder | Removed on 2026-10-23 Version: 0.4.1 Forks (GitHub): 5 Stars (GitHub): 8 Not marked · First seen |
Not listed |
| Official MCP Registry | Not listed | Listed Version: 0.3.3 Downloads/month (npm): 3 307 796 Downloads/week (npm): 1 399 692 Forks (GitHub): 1 286 Stars (GitHub): 10 312 Not marked · First seen |
| Claude Code: claude-plugins-official | Not listed | Listed Version: 0.2.0 Forks (GitHub): 1 286 Stars (GitHub): 10 312 Not marked · First seen |
| Docker MCP Catalog | Not listed | Listed Version: sha256:5df787069e37 Forks (GitHub): 1 286 Pulls (Docker Hub): 245 377 Stars (Docker Hub): 23 Stars (GitHub): 10 312 Not marked · First seen |
| Claude: knowledge-work-plugins | Not listed | Listed Version: 0.2.0 Forks (GitHub): 1 286 Stars (GitHub): 10 312 Not marked · First seen |
| Claude Code: claude-plugins-community | Not listed | Listed Version: 0.2.0 Forks (GitHub): 1 286 Stars (GitHub): 10 312 Not marked · First seen |
| npm registry (MCP servers) | Not listed | Listed Version: 0.2.92 Downloads/month (npm): 1 864 Downloads/week (npm): 1 537 Forks (GitHub): 1 286 Stars (GitHub): 10 312 Not marked · First seen |
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.
The facts side by side
| Fact | resolve-merge-conflictsno longer listed · | Desktop Commander |
|---|---|---|
| Marketplaces that list it (differs) | 0 | 7 |
| Stars (GitHub) (differs) | 8 | 10 312 |
| Pulls (Docker Hub) (differs) | No figure on Docker Hub | 245 377 |
| Forks (GitHub) (differs) | 5 | 1 286 |
| Last release (differs) | Not published | 2026-11-12 |
| Where it runs (differs) | Installs as a plugin bundle | On your machine (@wonderwhy-er/desktop-commander) |
| Transport (differs) | Not stated | stdio |
| Tools it declares (differs) | Not published | 26 |
| Environment variables it asks for | Not published | Not published |
| Parts of the bundle (differs) | Not published | 7 |
| Licence (differs) | Apache-2.0 | MIT |
| Repository (differs) | github.com/iowarp/clio-coder | github.com/wonderwhy-er/desktopcommandermcp |
| Changes in the last 7 days (differs) | 0 | 4 |
| First seen (differs) | 2026-10-13 | 2026-10-11 |
Lines where the two differ have a tinted background and bold values. No value is marked better or worse: a plugin no marketplace lists any more is shown with its last known data, which we do not rank against current figures.
What to use instead of resolve-merge-conflicts
Plugins still listed whose own names, descriptions, tools and skills are closest in meaning to it. Comparable, not endorsed.
-
GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
-
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.
-
conflictfix io.github.CloudCorpRecords/conflictfix
Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
-
Git branching strategies, conflict resolution, rebase workflows, monorepo patterns, and advanced operations like cherry-pick, bisect, and reflog recovery. Activate on "git…
-
gitwand io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
-
Git strategies, merge conflicts, and advanced version control expert
What each says it does
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 integrating many branches; use worktree-merge.
Desktop Commander
MCP server for terminal commands, file operations, and process management
How to run each
resolve-merge-conflicts
No data for an automatic command: what its marketplaces declare does not say unambiguously how to connect it.
Desktop Commander As a local MCP server: npm package
claude mcp add --transport stdio desktop-commander -- npx -y @wonderwhy-er/desktop-commanderCommands built only from what the marketplaces declare; the full set for every client is on each card.
Tools each declares
The marketplaces of resolve-merge-conflicts publish no list of tools, so we do not compare tools.
Settings each asks for
Neither one's marketplaces publish the settings it asks for.
What it can do: resolve-merge-conflicts · What it can do: Desktop Commander · Compare two other plugins
Data comes from public marketplace files in GitHub repositories of their authors. Data comes from the Official MCP Registry (registry.modelcontextprotocol.io), CC0 1.0. Data comes from the public marketplace file https://github.com/anthropics/claude-plugins-official/blob/HEAD/.claude-plugin/marketplace.json. Data comes from the Docker MCP Catalog (desktop.docker.com/mcp/catalog) and Docker Hub. Data comes from the public marketplace file https://github.com/anthropics/knowledge-work-plugins/blob/HEAD/.claude-plugin/marketplace.json. Data comes from the public marketplace file https://github.com/anthropics/claude-plugins-community/blob/HEAD/.claude-plugin/marketplace.json. Package data comes from the public npm registry (registry.npmjs.org). Figures come from our own regular passes over the marketplaces, last read on . We publish no contact details for plugin publishers.