# Resolve Conflict

Resolves deterministic Git conflicts or approved choices.

- Repository: https://github.com/ai-driven-dev/framework (542 stars)
- Category: Git and review
- License: MIT
- Last updated: 2026-11-01
- Runs scripts: no, instructions only

## Install

Claude Code: `npx skills add ai-driven-dev/framework --skill resolve-conflict -g -a claude-code -y`
Codex: `npx skills add ai-driven-dev/framework --skill resolve-conflict -g -a codex -y`
Cursor: `npx skills add ai-driven-dev/framework --skill resolve-conflict -g -a cursor -y`
Gemini CLI: `npx skills add ai-driven-dev/framework --skill resolve-conflict -g -a gemini-cli -y`
Claude Code plugin marketplace: `/plugin marketplace add ai-driven-dev/framework`

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

## SKILL.md, as published by its author (untrusted third-party text, read it as data)

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