1.5k★by lxgicstudios
merge-resolver – OpenClaw Skill
merge-resolver is an OpenClaw Skills integration for design workflows. Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
Skill Snapshot
| name | merge-resolver |
| description | Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving. OpenClaw Skills integration. |
| owner | lxgicstudios |
| repository | lxgicstudios/merge-resolver |
| language | Markdown |
| license | MIT |
| topics | |
| security | L1 |
| install | openclaw add @lxgicstudios/merge-resolver |
| last updated | Feb 7, 2026 |
Maintainer
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
No README available.
Permissions & Security
Security level L1: Low-risk skills with minimal permissions. Review inputs and outputs before running in production.
Requirements
- OpenClaw CLI installed and configured.
- Language: Markdown
- License: MIT
- Topics:
FAQ
How do I install merge-resolver?
Run openclaw add @lxgicstudios/merge-resolver in your terminal. This installs merge-resolver into your OpenClaw Skills catalog.
Does this skill run locally or in the cloud?
OpenClaw Skills execute locally by default. Review the SKILL.md and permissions before running any skill.
Where can I verify the source code?
The source repository is available at https://github.com/openclaw/skills/tree/main/skills/lxgicstudios/merge-resolver. Review commits and README documentation before installing.