---
title: "resolve-merge-conflicts"
description: "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-"
canonical: https://agentpluginsdirectory.com/plugins/resolve-merge-conflicts
last-updated: 2026-09-12
---

# 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.
- Slug: resolve-merge-conflicts
- Publisher: iowarp
- Repository: https://github.com/iowarp/clio-coder
- Manifest: library/skills/git/resolve-merge-conflicts/plugin.json
- Version: 0.4.0
- License: Apache-2.0
- Category (editorial): other
- Skills: 0
- MCP servers: 0
- Stars: 8
- Repository created: 2026-04-24
- Repository last pushed: 2026-09-12
- Publisher type: Organization
- Listing: https://agentpluginsdirectory.com/plugins/resolve-merge-conflicts
- Schema: https://agent-plugins.org/schemas/1.0.0/plugin.schema.json