Skip to main content
skill CX Codex

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

Install into Claude Code · Plugin marketplace All methods and platforms ↓
/plugin marketplace add ai-driven-dev/framework
/plugin install aidd-vcs@aidd-framework
Open on GitHub

What 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-framework

This 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-code

3Manually: put the files in place

~/.claude/skills/05-resolve-conflict/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/05-resolve-conflict/

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

Similar skills

All skills for Git and GitHub →

From the same set80

The whole set →
00-onboard 00-onboard walks a project through AIDD: reads the repo, picks the next step, shows it on screen, then acts on your reply. CX Codex +1 ★ 571repo stars 04-skill-generate 04-skill-generate generates router-based skills across AI tools through structured scoping and validation. Use it to scaffold new skills, turn manual workflows into skills, or refactor existing ones. CX Codex +1 ★ 571repo stars 03-context-generate The 03-context-generate skill routes requests to create skills, rules, agents, commands, or hooks to the matching generator. If you leave out the artifact type, it asks which one you mean. CX Codex +1 ★ 571repo stars 04-spec 04-spec writes spec.md, the contract for a single feature, from a request, a PRD or review notes. Or rewrites a spec that already exists. CX Codex +1 ★ 571repo stars 0-deps-wiring The 0-deps-wiring rule sets where application dependencies are composed and how the graph is reused. It fits TypeScript projects with command handlers and use cases. CX Codex +1 ★ 571repo stars 01-plan 01-plan turns a request, a ticket or a file into a phased implementation plan: gather the input, read the code, hand back a plan. CX Codex +1 ★ 571repo stars 05-improve 05-improve examines conversation logs, evaluates visible token usage, and suggests targeted refinements without touching your code. CX Codex +1 ★ 571repo stars 1-documentation The 1-documentation rule guides edits to project Markdown: it keeps decisions and useful commands while removing repetition and temporary records. It applies to selected files and folders. CX Codex +1 ★ 571repo stars

Project sponsors

Companies that keep this analytics open