# Merge Resolver

> Resolve Git merge conflicts intelligently.

- Skill: `majiayu000/merge-resolver-2` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/merge-resolver-2`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/merge-resolver-2/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Research & Search
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-21
- Page: https://skillmd.com/skills/majiayu000/merge-resolver-2

---


# 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