---

name: merge-resolver description: Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.

Merge Resolver

Resolve git merge conflicts without the headache. Reads your conflicted files and picks the right resolution based on context from both branches.

Usage

npx ai-merge-resolve [file]

Examples

# Resolve conflicts in a specific file
npx ai-merge-resolve src/index.ts

# Resolve all conflicts in the repo
npx ai-merge-resolve

# Dry run to preview resolutions
npx ai-merge-resolve --dry-run

Notes

• Free, open source, MIT licensed
• Built by LXGIC Studios
• GitHub: https://github.com/LXGIC-Studios/ai-merge-resolve