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.

564 stars 65 forksGit & Code Review Plugin marketplace

Install

Claude Code plugin
/plugin marketplace add ai-driven-dev/framework

The repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add ai-driven-dev/framework --skill 05-resolve-conflict
Manual install
git clone --depth 1 https://github.com/ai-driven-dev/framework.git /tmp/framework
mkdir -p ~/.claude/skills
cp -r /tmp/framework/plugins/aidd-vcs/skills/05-resolve-conflict ~/.claude/skills/05-resolve-conflict

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# 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.
Read the full skill on GitHub

Details

Skill name
05-resolve-conflict
Path
plugins/aidd-vcs/skills/05-resolve-conflict/SKILL.md
License
MIT
Repo updated
18 November 2026

FAQ

What does the 05 Resolve Conflict skill do?

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.

How do I install the 05 Resolve Conflict skill?

Claude Code plugin: /plugin marketplace add ai-driven-dev/framework. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is 05 Resolve Conflict popular?

It lives in ai-driven-dev/framework, which has 564 GitHub stars and 65 forks.

Related skills

00 Async Dev

564

ai-driven-dev/framework

Drive the async-dev pipeline from one entry point, whether setup, run, or review. Use when the user wants to install async dev, run a ready issue, or address PR review comments, or on a webhook trigger. Not for plain status checks.

Git & Code Review65

00 Init

564

ai-driven-dev/framework

Turn AIDD measurement on for a project after explicit consent, stop it, choose to be named on your own measurement, or delete what was measured. Use when the user wants to start or stop measuring what their work consumes, add or remove their name, or forget measured data. Not for answering what a period consumed.

Other65

00 Onboard

564

ai-driven-dev/framework

Guide a project's journey through AIDD, from first setup to shipping a feature. Use when the user says onboard me, where do I start, or what to do next. Not for listing every installed surface.

Other65

Changelog Generator

581

claude-office-skills/skills

Generate release notes from git commits, updates, or feature lists

Git & Code Review105

03 Shadow Areas

564

ai-driven-dev/framework

Scan a markdown artifact (idea, stories, PRD, spec) for blind spots into a shadow report grouped by category and severity. Use to find gaps or what is missing in a written artifact. Not for interactive Q&A or code review.

Git & Code Review65

Release

369

niaka3dayo/agent-skills-vrc-udon

Release procedure for agent-skills-vrc-udon: sync main into dev, bump the five version fields, open and merge the release PR, rewrite the Release Drafter notes, and publish to npm. Use when asked to cut, prepare, or publish a release, to bump the version, or to sync main into dev. Maintainer-only; not distributed.

Git & Code Review

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.