merge-resolver
Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
Install
mkdir -p .claude/skills/merge-resolver && curl -L -o skill.zip "https://mcp.directory/api/skills/download/3957" && unzip -o skill.zip -d .claude/skills/merge-resolver && rm skill.zipInstalls to .claude/skills/merge-resolver
About this skill
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
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.
fastapi-templates
wshobson
Create production-ready FastAPI projects with async patterns, dependency injection, and comprehensive error handling. Use when building new FastAPI applications or setting up backend API projects.
Related MCP Servers
Browse all servers
JSON Resume EnhancerBoost your job search with our AI powered resume builder that enhances JSON Resumes using GitHub projects for smarter, u
GitLabGitLab MCP Server integrates with the GitLab API for seamless CI CD and continuous integration automation using natural
Ethereum Name Service (ENS)Easily manage, lookup, and buy ENS domains with seamless integration to the Ethereum Name Service (ENSdomains) using fle
GitLabIntegrate with GitLab for seamless repository management, file operations, CI/CD, issue tracking, and merge requests via
MarkitdownEasily convert markdown to PDF using Markitdown MCP server. Supports HTTP, STDIO, and SSE for fast converting markdown t
FirecrawlUnlock AI-ready web data with Firecrawl: scrape any website, handle dynamic content, and automate web scraping for resea
Stay ahead of the MCP ecosystem
Get weekly updates on new skills and servers.