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
Resolve Git merge conflicts intelligently.
npx skillmds@latest add majiayu000/merge-resolver-2 Resolve Git merge conflicts intelligently.
majiayu000/claude-skill-registry/tree/main/skills/development/merge-resolver-niraven-pokee-deep-research commit 0db3ac7059