resolve-merge-conflicts vs GitInProgress
resolve-merge-conflicts is no longer listed on any marketplace we read: these are its last known data, as of 2026‑10‑16.
resolve-merge-conflicts is a plugin bundle for AI coding tools published by iowarp. No marketplace we read lists it any more. GitInProgress is an MCP server published by ysk-abe. Marketplaces we read that list it: 1 (Official MCP Registry). As of our marketplace pass on 2026-10-19. 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 |  GitInProgress | |
|---|---|---|
| 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 |
| Official MCP Registry | Not listed | Listed Version: 0.1.3 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-conflictsno longer listed · | GitInProgress |
|---|---|---|
| Marketplaces that list it (differs) | 0 | 1 |
| Stars (GitHub) (differs) | 8 | 0 |
| Forks (GitHub) (differs) | 5 | 0 |
| Last release | Not published | Not published |
| Where it runs (differs) | Installs as a plugin bundle | Not stated |
| Transport | Not stated | Not stated |
| Tools it declares | Not published | Not published |
| Environment variables it asks for | Not published | Not published |
| Licence (differs) | Apache-2.0 | Not stated |
| Repository (differs) | github.com/iowarp/clio-coder | github.com/ysk-abe/gitinprogress-issues |
| Changes in the last 7 days (differs) | 4 | 0 |
| 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.
-
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.
-
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.
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.
GitInProgress
Group your AI's changes into focused commit candidates; nothing lands until you approve.
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.
GitInProgress
No data for an automatic command: what its marketplaces declare does not say unambiguously how to connect it.
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
Neither one's marketplaces publish the settings it asks for.
What it can do: resolve-merge-conflicts · What it can do: GitInProgress · 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.