Merge Resolve

Use when a user asks to resolve a git merge conflict or conflicting patch, says "ai-merge" or "AI-resolve," when merge or rebase exits with conflict markers and next steps are requested, when parallel worktrees need integration, or when a chain diff targets a file being edited.

sumitake Updated 0 repo stars

File contents

sumitake/agent-collab commit baab3b4928

Frequently asked questions

npx get-skill add sumitake/merge-resolve