# 05 Resolve Conflict

> 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.

- Skill: `ai-driven-dev/resolve-conflict` (Agent Skill, multi-file: 3 files)
- Install (CLI): `npx get-skill add ai-driven-dev/resolve-conflict`
- Raw SKILL.md: https://api.skillmd.com/api/skills/ai-driven-dev/resolve-conflict/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: ai-driven-dev (https://skillmd.com/u/ai-driven-dev)
- Updated: 2026-11-16
- Page: https://skillmd.com/skills/ai-driven-dev/resolve-conflict

---


# 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.

