Resolve Conflicts

Analyze and resolve Git merge/rebase conflicts intelligently, showing diffs and asking clarifying questions when needed. Invoke with /resolve-conflicts.

mthines Updated 20 repo stars
aw: one sentence in, a reviewed pull request out. It sizes the job (Micro, Lite, Full); a Full task runs Brief, Build until green, Fresh-eyes review, and Draft

File contents

mthines/agent-skills commit 13b3b33f9f

Frequently asked questions

npx get-skill add mthines/resolve-conflicts