resolve-conflict — Claude Code skill: what it does, how to install
resolve-conflict resolves deterministic Git conflicts during merge, rebase, or cherry-pick. Stops right after staging modified files.
MIT ★ 571 updated 2026-10-29
/plugin marketplace add ai-driven-dev/framework
/plugin install aidd-vcs@aidd-frameworkWhat resolve-conflict does
The skill inspects ongoing Git conflicts and applies clear-cut resolutions. When competing implementations require a choice, it builds a proposal table and waits for your input.
Untouched sections and index entries remain intact. The workflow stages strictly the files resolved by the skill. It never creates commits, switches branches, or runs commands to abort or continue rebasing.
What it helps with
- resolve deterministic conflicts during rebase or merge
- generate a decision table when conflict choices need manual approval
- stage only resolved files without touching unrelated changes
Example prompts for the agent
- Resolve active Git merge conflicts
- Propose choices for the current rebase conflict
- Apply approved decisions to the conflicted files
How to install resolve-conflict
1Plugin marketplace
/plugin marketplace add ai-driven-dev/framework/plugin install aidd-vcs@aidd-frameworkThis installs the whole aidd-vcs plugin with all its skills
2Skills CLI (Vercel)
npx skills add ai-driven-dev/framework --skill resolve-conflict -a claude-code3Manually: put the files in place
~/.claude/skills/05-resolve-conflict/SKILL.mdCopy the whole skill folder; for one project use .claude/skills/05-resolve-conflict/
1Skills CLI (Vercel)
npx skills add ai-driven-dev/framework --skill resolve-conflict -a codex2Manually: put the files in place
.agents/skills/05-resolve-conflict/SKILL.mdFor all projects use ~/.agents/skills/
1Skills CLI (Vercel)
npx skills add ai-driven-dev/framework --skill resolve-conflict -a cursor2Manually: put the files in place
.cursor/skills/05-resolve-conflict/SKILL.mdCursor also reads .agents/skills/ and .claude/skills/
1GitHub CLI
gh skill install ai-driven-dev/framework plugins/aidd-vcs/skills/05-resolve-conflict2Manually: put the files in place
.github/skills/05-resolve-conflict/SKILL.md1Skills CLI (Vercel)
npx skills add ai-driven-dev/framework --skill resolve-conflict -a gemini-cli2Platform CLI
gemini skills install https://github.com/ai-driven-dev/framework --path plugins/aidd-vcs/skills/05-resolve-conflictManually: put the files in place
.devin/skills/05-resolve-conflict/SKILL.mdThe legacy .windsurf/skills/ path still works
Skills CLI (Vercel)
npx skills add ai-driven-dev/framework --skill resolve-conflict -a opencodeClaude.ai
Zip the folder and upload it in Settings → Capabilities → Skills
Step by step, with commands for each platform: How to install skills in Claude Code: five ways
Questions about resolve-conflict
How to install resolve-conflict in Claude Code?
Add the marketplace first with /plugin marketplace add ai-driven-dev/framework, then execute /plugin install aidd-vcs@aidd-framework.
Does the skill commit resolved files automatically?
No. Its rules explicitly forbid committing, switching branches, or continuing Git operations after staging files.
What happens when a conflict needs human approval?
The skill halts and presents a proposal table. It proceeds only after you approve the chosen options.
Source text
SKILL.md · MIT
--- name: resolve-conflict description: Resolves deterministic Git conflicts or approved choices. Use when the user wants to resolve a merge, rebase, or cherry-pick conflict. Not for deciding between competing implementations or committing changes. argument-hint: conflict | decision --- # Resolve Conflict ```mermaid flowchart LR start([active Git conflict]) --> resolve resolve -->|no active conflict| none([report no conflict]) resolve -->|all rows decided| applied([resolve and report]) resolve -->|approval needed| proposal([propose and stop]) proposal -->|approved table| resolve ``` ## Actions Read only the next action file. | Action | Does | | ------ | ---- | | resolve | resolve conflicts or propose choices | ## Transversal rules - Change only what the decided conflict resolutions require; preserve all other content and index entries. - Stop after staging and validation. Do not commit, continue, abort, or switch branches. - Stage only files resolved by this skill, never unrelated files.
© AI-Driven Dev · MIT · ai-driven-dev/framework