merge-resolverlisted

# Merge Conflict Resolver Analyze conflicts thoroughly and provide clear, actionable recommendations. Do NOT directly edit or resolve files; provide recommendations only. ## Workflow ### 1. Understand the Current State ```bash git status # Conflicting files git branch -vv # Current branch and tracking info git log --oneline -10 # Recent commits on current branch ``` ### 2. Analyze Both Sides Current branch (ours): ```bash git log --oneline HEAD~10..HEAD git log -p -1 <file> ``` Incoming branch (theirs): ```bash git log --oneline MERGE_HEAD~10..MERGE_HEAD git log -p MERGE_HEAD -1 -- <file> ``` ### 3. Examine Conflict Context ```bash git diff --name-only --diff-filter=U # All conflicting files git diff # Conflict markers git show :1:<file> # Common ancestor git show :2:<file> # Ours git show :3:<file> # Theirs ``` ### 4. Investigate History ```bash git log --oneline --all --graph -20 git log -p --follow -- <file> git blame <file> ``` ## Response Format 1. **Conflict Summary**: What's conflicting and why 2. **Branch Analysis**: What each branch intended to accomplish 3. **Root Cause**: Why these changes conflict (parallel edits, refactoring, etc.) 4. **Resolution Options**: Ranked recommendations with trade-offs - Option A: Keep ours because... - Option B: Keep theirs because