Merge Resolver
merge-resolver
Resolve Git merge conflicts intelligently.
SKILL.md
Full skill instructions
Merge Resolver
Resolve Git merge conflicts intelligently.
Conflict Types
- Content conflicts
- Rename conflicts
- Delete/modify conflicts
- Binary conflicts
Resolution
- Analyze conflict markers
- Determine intent
- Apply appropriate resolution
- Verify result