conflict-resolver
About
The Conflict Resolver skill intelligently analyzes and resolves git merge conflicts by examining context, detecting patterns, and applying automated strategies. It identifies conflict types, proposes safe automatic fixes or guided manual resolutions, and validates the final syntax. Developers should use this Claude Skill when facing complex merge conflicts to get expert recommendations on combining changes or restructuring code.
Quick Install
Claude Code
Recommendednpx skills add aiskillstore/marketplace -a claude-code/plugin add https://github.com/aiskillstore/marketplacegit clone https://github.com/aiskillstore/marketplace.git ~/.claude/skills/conflict-resolverCopy and paste this command in Claude Code to install this skill
GitHub Repository
Frequently asked questions
What is the conflict-resolver skill?
conflict-resolver is a Claude Skill by aiskillstore. Skills package instructions and resources that Claude loads on demand, so Claude can perform conflict-resolver-related tasks without extra prompting.
How do I install conflict-resolver?
Use the install commands on this page: add conflict-resolver to Claude Code as a plugin, or clone its repository into your skills directory, then restart Claude so it picks up the skill.
What category does conflict-resolver belong to?
conflict-resolver is in the Design category, tagged automation.
Is conflict-resolver free to use?
Yes. conflict-resolver is listed on AIMCP and free to install. It runs inside Claude, so no separate service account is required to use the skill itself.
Related Skills
Use the executing-plans skill when you have a complete implementation plan to execute in controlled batches with review checkpoints. It loads and critically reviews the plan, then executes tasks in small batches (default 3 tasks) while reporting progress between each batch for architect review. This ensures systematic implementation with built-in quality control checkpoints.
This skill dispatches a code-reviewer subagent to analyze code changes against requirements before proceeding. It should be used after completing tasks, implementing major features, or before merging to main. The review helps catch issues early by comparing the current implementation with the original plan.
This skill provides a comprehensive guide for developers to connect MCP servers to Claude Code using HTTP, stdio, or SSE transports. It covers installation, configuration, authentication, and security for integrating external services like GitHub, Notion, and custom APIs. Use it when setting up MCP integrations, configuring external tools, or working with Claude's Model Context Protocol.
This skill helps developers choose between Claude Code Web and CLI interfaces based on task analysis, then enables seamless session teleportation between these environments. It optimizes workflow by managing session state and context when switching between web, CLI, or mobile. Use it for complex projects requiring different tools at various stages.