Merge Resolver

Resolve Git merge conflicts intelligently.

majiayu000 Updated 567 repo stars

File contents

Merge Resolver

Resolve Git merge conflicts intelligently.

Conflict Types

  • Content conflicts
  • Rename conflicts
  • Delete/modify conflicts
  • Binary conflicts

Resolution

  1. Analyze conflict markers
  2. Determine intent
  3. Apply appropriate resolution
  4. Verify result

majiayu000/claude-skill-registry/tree/main/skills/development/merge-resolver-niraven-pokee-deep-research commit 0db3ac7059

Frequently asked questions

npx skillmds@latest add majiayu000/merge-resolver-2