Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
Scanned 9/7/2026
Install to Claude Code
Skills Directorynpx -y skills add modbender/skill-library-mcp --skill merge-resolver --agent claude-codeInstalls into .claude/skills of the current project.
Are you the author of Merge Resolver?
Add the live security badge to your README — it updates automatically with every re-scan.
[](https://www.skillsdirectory.com/skills/modbender-merge-resolver)More formats (shields.io, HTML) on the badges page.
---
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
```bash
npx ai-merge-resolve [file]
```
## Examples
```bash
# 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
Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.
No comments yet. Be the first to comment!
