resolve-conflicts - Resolve Git merge conflicts with a plan
Assess Git merge conflicts, create an approval-based resolution plan, apply file-specific strategies, regenerate generated files, and run validation.
Tags
Updated: 2026-10-03Capabilities
Typical Inputs
Typical Outputs
What this skill does
- Assess conflicted files
- Categorize conflict types
- Create resolution plans
- Request user approval
- Back up modified deletions
- Merge compatible changes
- Regenerate generated files
- Explain resolution decisions
- Run validation tests
Inputs
- Git repository
- Conflicted files
- Branch changes
- User approval
- User conflict decisions
- Generation commands
- Project test commands
Outputs
- Resolution plan
- User-facing conflict questions
- Backup files
- Analysis reports
- Resolved files
- Staged generated files
- Validation results
- Resolution explanations
Requirements
- Git repository access
- Permission to modify files
- Permission to run commands
- Project-specific generation tools
- Project-specific test tools
- User approval before changes