openclaw / merge-resolver
Install for your project team
Run this command in your project directory to install the skill for your entire team:
mkdir -p .claude/skills/merge-resolver && curl -L -o skill.zip "https://fastmcp.me/Skills/Download/3957" && unzip -o skill.zip -d .claude/skills/merge-resolver && rm skill.zipProject Skills
This skill will be saved in .claude/skills/merge-resolver/ and checked into git. All team members will have access to it automatically.
Important: Please verify the skill by reviewing its instructions before using it.
Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
0 views
0 installs
Skill Content
--- 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