# Merge Resolve

> AI-powered git merge conflict resolution

- Skill: `lxgic-studios/merge-resolve` (Agent Skill, multi-file: 6 files)
- Install (CLI): `npx skillmds@latest add lxgic-studios/merge-resolve`
- Raw SKILL.md: https://api.skillmd.com/api/skills/lxgic-studios/merge-resolve/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: LXGIC-Studios (https://skillmd.com/u/lxgic-studios)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/lxgic-studios/merge-resolve

---


# Merge Resolver

Got merge conflicts? This tool understands both versions and picks the right resolution.

## Quick Start

```bash
npx ai-merge-resolve
```

## What It Does

- Finds all merge conflicts in repo
- Analyzes both versions semantically
- Suggests intelligent resolutions
- Can auto-resolve simple conflicts

## Usage Examples

```bash
# Resolve all conflicts
npx ai-merge-resolve

# Resolve specific file
npx ai-merge-resolve ./src/api.ts

# Auto-resolve obvious ones
npx ai-merge-resolve --auto

# Interactive mode
npx ai-merge-resolve --interactive
```

## How It Works

Doesn't just pick "theirs" or "ours". Actually reads the code, understands intent, and merges the functionality properly.

## Output

```
Resolving src/utils.ts...
- Conflict 1: Both added logging → Combined both log statements
- Conflict 2: Different error messages → Kept more descriptive one
✓ Resolved 2 conflicts
```

## Requirements

Node.js 18+. OPENAI_API_KEY required. Must have active merge conflicts.

## License

MIT. Free forever.