resolve-merge-conflicts vs GitWhy — The Context Layer for Git
resolve-merge-conflicts is a plugin bundle for AI coding tools published by iowarp. Marketplaces we read that list it: 1 (Community GitHub marketplaces). GitWhy — The Context Layer for Git is an MCP server published by gitwhy-cli. Marketplaces we read that list it: 1 (Official MCP Registry). As of our marketplace pass on 2026-10-13. This pair was picked by a reader, not by our comparison rule, so search engines are asked not to index the page.
Where each is published
| Marketplace |  resolve-merge-conflicts |  GitWhy — The Context Layer for Git |
|---|---|---|
| Community marketplace iowarp/clio-kit | Listed Version: 0.4.0 Forks (GitHub): 5 Stars (GitHub): 8 Not marked · First seen |
Not listed |
| Official MCP Registry | Not listed | Listed Version: 0.7.9 Downloads/month (npm): 151 Downloads/week (npm): 33 Forks (GitHub): 0 Stars (GitHub): 0 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-conflicts | GitWhy — The Context Layer for Git |
|---|---|---|
| Marketplaces that list it | 1 | 1 |
| Stars (GitHub) (differs) | 8 (better) | 0 (worse) |
| Forks (GitHub) (differs) | 5 (better) | 0 (worse) |
| Last release | Not published | Not published |
| Where it runs (differs) | Installs as a plugin bundle | On your machine (gitwhy-mcp) |
| Transport (differs) | Not stated | stdio |
| Tools it declares | Not published | Not published |
| Environment variables it asks for (differs) | Not published | 1, secrets among them: 1 |
| Licence (differs) | Apache-2.0 | Not stated |
| Repository (differs) | github.com/iowarp/clio-coder | github.com/gitwhy-cli/gitwhy |
| Changes in the last 7 days (differs) | 2 | 0 |
| First seen (differs) | 2026-10-13 | 2026-10-11 |
Lines where the two differ have a tinted background and bold values. Where the data itself says which value is better (more marketplaces, a larger figure of the same marketplace, a fresher release, a verified mark on a marketplace that lists both), the better one is also marked green with ▲ and the worse one red with ▼. Where it runs, the transport, the tools, the settings, hooks, the bundle's parts, the licence and the week's changes are marked only as different: more or fewer is not better in itself.
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.
GitWhy — The Context Layer for Git
The shared AI context engine for git — save, search, and share the reasoning behind code changes.
How to run each
resolve-merge-conflicts As a Claude Code plugin
/plugin marketplace add iowarp/clio-kit
/plugin install resolve-merge-conflicts@clio-kitGitWhy — The Context Layer for Git As a local MCP server: npm package
claude mcp add --env "GITWHY_API_KEY=<YOUR_GITWHY_API_KEY>" --transport stdio gitwhy -- npx -y gitwhy-mcpRequires: GITWHY_API_KEY (secret)
Commands built only from what the marketplaces declare; the full set for every client is on each card.
Tools each declares
Neither one's marketplaces publish a list of tools, so there is nothing to compare.
Settings each asks for
The marketplaces of resolve-merge-conflicts publish no settings it asks for, so we do not compare settings.
What it can do: resolve-merge-conflicts · What it can do: GitWhy — The Context Layer for Git · 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. Figures come from our own regular passes over the marketplaces, last read on . We publish no contact details for plugin publishers.