iowarp/resolve-merge-conflicts
v0.4.1Apache-2.0
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.
plugin.json
- name
- resolve-merge-conflicts
- version
- 0.4.1
- 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-merge.
- license
- Apache-2.0
- extensions
- ai.iowarp.clio
plugin.json
{
"$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
"name": "resolve-merge-conflicts",
"version": "0.4.1",
"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-merge.",
"license": "Apache-2.0",
"extensions": {
"ai.iowarp.clio": {
"manifestVersion": 1,
"kind": "skill",
"resources": {
"skills": "."
},
"components": [
{
"kind": "skill",
"id": "resolve-merge-conflicts",
"path": "SKILL.md"
}
]
}
}
}
Client extensions
Data this package carries for particular clients. The directory lists the clients named and never reads what is addressed to them.
- ai.iowarp.clio