Install
mkdir -p .claude/skills/merge-resolve && curl -L -o skill.zip "https://mcp.directory/api/skills/download/9070" && unzip -o skill.zip -d .claude/skills/merge-resolve && rm skill.zipInstalls to .claude/skills/merge-resolve
About this skill
Merge Resolver
Got merge conflicts? This tool understands both versions and picks the right resolution.
Quick Start
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
# 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.
Built by LXGIC Studios
- GitHub: github.com/lxgicstudios/ai-merge-resolve
- Twitter: @lxgicstudios
More by openclaw
View all skills by openclaw →You might also like
flutter-development
aj-geddes
Build beautiful cross-platform mobile apps with Flutter and Dart. Covers widgets, state management with Provider/BLoC, navigation, API integration, and material design.
drawio-diagrams-enhanced
jgtolentino
Create professional draw.io (diagrams.net) diagrams in XML format (.drawio files) with integrated PMP/PMBOK methodologies, extensive visual asset libraries, and industry-standard professional templates. Use this skill when users ask to create flowcharts, swimlane diagrams, cross-functional flowcharts, org charts, network diagrams, UML diagrams, BPMN, project management diagrams (WBS, Gantt, PERT, RACI), risk matrices, stakeholder maps, or any other visual diagram in draw.io format. This skill includes access to custom shape libraries for icons, clipart, and professional symbols.
ui-ux-pro-max
nextlevelbuilder
"UI/UX design intelligence. 50 styles, 21 palettes, 50 font pairings, 20 charts, 8 stacks (React, Next.js, Vue, Svelte, SwiftUI, React Native, Flutter, Tailwind). Actions: plan, build, create, design, implement, review, fix, improve, optimize, enhance, refactor, check UI/UX code. Projects: website, landing page, dashboard, admin panel, e-commerce, SaaS, portfolio, blog, mobile app, .html, .tsx, .vue, .svelte. Elements: button, modal, navbar, sidebar, card, table, form, chart. Styles: glassmorphism, claymorphism, minimalism, brutalism, neumorphism, bento grid, dark mode, responsive, skeuomorphism, flat design. Topics: color palette, accessibility, animation, layout, typography, font pairing, spacing, hover, shadow, gradient."
godot
bfollington
This skill should be used when working on Godot Engine projects. It provides specialized knowledge of Godot's file formats (.gd, .tscn, .tres), architecture patterns (component-based, signal-driven, resource-based), common pitfalls, validation tools, code templates, and CLI workflows. The `godot` command is available for running the game, validating scripts, importing resources, and exporting builds. Use this skill for tasks involving Godot game development, debugging scene/resource files, implementing game systems, or creating new Godot components.
nano-banana-pro
garg-aayush
Generate and edit images using Google's Nano Banana Pro (Gemini 3 Pro Image) API. Use when the user asks to generate, create, edit, modify, change, alter, or update images. Also use when user references an existing image file and asks to modify it in any way (e.g., "modify this image", "change the background", "replace X with Y"). Supports both text-to-image generation and image-to-image editing with configurable resolution (1K default, 2K, or 4K for high resolution). DO NOT read the image file first - use this skill directly with the --input-image parameter.
pdf-to-markdown
aliceisjustplaying
Convert entire PDF documents to clean, structured Markdown for full context loading. Use this skill when the user wants to extract ALL text from a PDF into context (not grep/search), when discussing or analyzing PDF content in full, when the user mentions "load the whole PDF", "bring the PDF into context", "read the entire PDF", or when partial extraction/grepping would miss important context. This is the preferred method for PDF text extraction over page-by-page or grep approaches.
Related MCP Servers
Browse all servers
GitLabAutomate repository management, issue tracking, and merge requests with GitLab API integration for streamlined developme
Solana AgentSolana Agent: a server for blockchain interactions on Solana, offering asset retrieval, token deployment, wallet managem
GitLabGitLab MCP Server integrates with the GitLab API for seamless CI CD and continuous integration automation using natural
RootlyIntegrate Rootly's incident management API for real-time production issue resolution in code editors with efficient cont
JSON Splitter and MergerEffortlessly split or merge large JSON files with our JSON Splitter and Merger for streamlined and efficient data proces
GitLab & JiraIntegrate GitLab & Jira for seamless merge reviews, pipelines, issue tracking, and unified search for better project coo
Stay ahead of the MCP ecosystem
Get weekly updates on new skills and servers.