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: