conflict-resolvelisted

# Guided Conflict Resolution I'll help you resolve merge conflicts with semantic analysis and intelligent strategy recommendations. Arguments: `$ARGUMENTS` - strategy (ours/theirs/manual) or file path ## Conflict Resolution Philosophy Resolve conflicts intelligently: - Semantic conflict analysis - Strategy recommendation (ours/theirs/manual) - Side-by-side diff display - Test validation after resolution - Integration with `/test` skill ## Token Optimization This skill uses conflict resolution-specific patterns to minimize token usage: ### 1. Conflict State Caching (600 token savings) **Pattern:** Cache conflict detection and file lists - Store conflict state in `.conflict-resolve-cache` (5 min TTL) - Cache: conflicted files, conflict types, merge/rebase status - Read cached state on subsequent runs (50 tokens vs 650 tokens fresh) - Invalidate on git status changes - **Savings:** 92% on repeated conflict checks during resolution ### 2. Early Exit for No Conflicts (95% savings) **Pattern:** Detect no-conflict state immediately - Check for MERGE_HEAD or rebase-merge directory (50 tokens) - If no merge/rebase in progress: return "No conflicts" (80 tokens) - **Distribution:** ~40% of runs are conflict status checks - **Savings:** 80 vs 2,500 tokens for no-conflict checks ### 3. Bash-Based Conflict Detection (800 token savings) **Pattern:** Use git commands for conflict detection - List conflicts: `git diff --name-only --diff-filter=U` (100 tokens) - Show conflict markers: