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…
Пакет плагинов · от iowarp
Коротко
resolve-merge-conflicts: пакет плагинов для ИИ-инструментов разработки, издатель iowarp. Витрин, которые мы читаем и где он опубликован: 1 (Community GitHub marketplaces). Мы впервые увидели его 2026-10-13 и с тех пор изменений не фиксировали. Данные нашего прохода по витринам на 2026-10-15.
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.
Что просит
- Ставится как пакет плагинов
Ни одна из витрин, которые мы читаем, не публикует его инструменты или настройки, которые он просит.
Что объявляет, просит и запускает, полностью
Устанавливайте плагины только от разработчиков, которым доверяете. Мы показываем то, что публикуют витрины, и не проверяем плагины.
Работает с
- Claude Code
По маркетплейсам, где он опубликован, и объявленному транспорту MCP, как их документирует каждый клиент. Плагины мы не тестируем.
Подключить
Команды и конфигурации собраны только из того, что объявляют витрины. Мы не запускаем их за вас и не проверяем плагины.
Как плагин Claude Code
Собрано из того, что объявляет Community GitHub marketplaces.
/plugin marketplace add iowarp/clio-kit
/plugin install resolve-merge-conflicts@clio-kit
Где опубликован
| Витрина | Статус | Версия | Числа | Проверен | Впервые замечен |
|---|---|---|---|---|---|
| Маркетплейс сообщества iowarp/clio-kit (Открыть исходники на GitHub) | Опубликован | 0.4.0 | Форки (GitHub): 5 Звёзды (GitHub): 8 |
Не помечен |
Каждое число принадлежит своей витрине и никогда не складывается с числами других витрин. Если витрина число не публикует, мы его не показываем: нет числа не значит ноль.
Есть в одном маркетплейсе сообщества
| Витрина | Репозиторий | Звёзды (GitHub) |
|---|---|---|
| clio-kit | iowarp/clio-kit | 29 |
Что менялось
- Стал продуктом, за которым мы следим
- Community GitHub marketplaces: появился
Похожие плагины
Продукты, чьи собственные названия, описания, инструменты и скиллы ближе всего по смыслу к этому, на всех витринах, которые мы читаем. Близость упорядочена только внутри этого списка.
-
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.
Похожие плагины по витринам
Тот же вопрос к каждой витрине по отдельности: есть ли там аналог этого плагина?
Есть на витрине 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…
Есть на витрине 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…
Есть на витрине 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
Есть на витрине 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.
Есть на витрине 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…
Есть на витрине 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…
Есть на витрине 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.
Есть на витрине 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…
Есть на витрине 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.
Есть на витрине 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.
Найдено по смыслу, а не по общему коду или репозиторию: похожие плагины остаются разными продуктами, и это не обзор и не рекомендация.
Хотите такой знак у своего плагина в нашем каталоге?
Докажите, что поддерживаете его, файлом в репозитории, файлом на вашем домене или DNS-записью, и сможете показать этот знак на карточке, а ещё живые баннеры для сайта и README. Как проходит подтверждение
Ещё вы будете получать уведомления, когда витрина добавит плагин, снимет его, изменит отметку verified или список того, что он просит, а его удалённый endpoint встанет на мониторинг как веб-сервис.
Данные витрины Community GitHub marketplaces. Числа взяты из наших регулярных обходов витрин, последняя проверка . Контакты издателей плагинов мы не публикуем.