Merge Conflict Walkthrough

Description

Walks through each conflicted file in a merge or rebase - lists files, reads markers, proposes a resolution with rationale. ## Purpose Merge conflicts are where solo developers lose the most time. This skill removes the "which side was mine again?" confusion by reading both sides of each conflict, proposing a resolution that preserves both intents where possible, and explaining its reasoning. ## When to use - Any merge or rebase with 3+ conflicted files. - A single file with non-obvious conf

Installation

Installs to ~/.claude/skills/bryancollins99-agent-skills-merge-conflict-walkthrough/SKILL.md

Restart Claude Code, or start a new session, for it to be picked up.