What problem does it solve? Merge conflicts during git merges, rebases, and cherry-picks are error-prone to fix by hand, and a wrong resolution can silently delete someone's work. This Skill guides the AI through a structured workflow that detects conflicts, analyzes both sides' intent, and resolves them only after your approval. ## Core Features & Use Cases - Conflict Detection & Analysis: Identifies conflicted files with git diff --name-only --diff-filter=U and inspects ours/theirs/ancestor versions via git show :1: :2: :3: to understand each side's intent. - Guided Resolution with Approval: Presents a per-conflict summary (ours vs theirs, recommendation, reason) and waits for your confirmation before editing anything. - Safe Verification & Staging: Verifies no conflict markers remain, runs git diff --check, stages files individually, and never auto-commits or aborts operations. - Use Case: During a rebase of a feature branch, both sides modified the same function. The Skill merges caching logic from one side with error handling from the other, shows you the combined result, and stages it only after you approve. ## Quick Start Resolve the merge conflicts in my current git rebase, showing me each conflict and your recommended resolution before applying it.
