fix-conflicts
Identifies and resolves Git conflicts through automated state detection and history analysis.
Install
mkdir -p .claude/skills/fix-conflicts && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/13113" && unzip -o skill.zip -d .claude/skills/fix-conflicts && rm skill.zipInstalls to .claude/skills/fix-conflicts
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Use when git reports merge conflicts, rebase conflicts, cherry-pick conflicts, or revert conflicts, or when the user asks to resolve conflicts. Triggers: \"fix conflicts\", \"resolve conflicts\", \"merge conflicts\", \"rebase conflicts\", \"fix merge\", \"resolve merge\", \"help with conflicts\", \"conflict markers\".Key capabilities
- →Detect the type of Git conflict (merge, rebase, revert, cherry-pick)
- →Identify conflicted files and their conflict types
- →Read conflicted files and focus on conflict markers
- →Gather local and remote commit history for context
- →Inspect commit diffs to understand intent
- →Resolve standard conflicts by merging, combining, or choosing sides
How it works
The skill detects the conflict state, reads conflicted files, gathers commit history to understand intent, and then resolves conflicts based on type and intent, reporting the results.
Inputs & outputs
When to use fix-conflicts
- →Fixing merge conflicts
- →Resolving rebase conflicts
- →Fixing cherry-pick conflicts
About fix-conflicts
Detects the type and location of Git conflicts by inspecting the current working state. It guides users through resolving markers by providing contextual diff history from both local and remote branches.
Use when git reports merge conflicts, rebase conflicts, cherry-pick conflicts, or revert conflicts, or when the user asks to resolve conflicts. Triggers: \"fix conflicts\", \"resolve conflicts\", \"merge conflicts\", \"rebase conflicts\", \"fix merge\", \"resolve merge\", \"help with conflicts\", \"
When not to use it
- →When there are no Git conflicts to resolve
- →When the user explicitly wants to continue the Git operation automatically
- →When the user wants to re-add intentionally deleted code
Limitations
- →Never automatically run `git merge --continue` or similar commands
- →Does not re-add intentionally deleted code
- →Semantic conflicts (compiles but logically wrong) are flagged as risks
How it compares
This skill provides a structured, analytical approach to resolving Git conflicts by examining commit history and intent, rather than simply choosing 'ours' or 'theirs' blindly.
Compared to similar skills
fix-conflicts side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| fix-conflicts (this skill) | 0 | 4mo | Review | Advanced |
| resolve-conflicts | 81 | 10mo | Review | Intermediate |
| dependency-upgrade | 26 | 6mo | Review | Intermediate |
| openspec-onboard | 10 | 8mo | Review | Beginner |
Try saying
Example prompts that trigger this skill in your AI assistant.
More by rtfpessoa
View all by rtfpessoa →You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
dependency-upgrade
wshobson
Manage major dependency version upgrades with compatibility analysis, staged rollout, and comprehensive testing. Use when upgrading framework versions, updating major dependencies, or managing breaking changes in libraries.
openspec-onboard
studyzy
Guided onboarding for OpenSpec - walk through a complete workflow cycle with narration and real codebase work.
codex-cli-bridge
alirezarezvani
Bridge between Claude Code and OpenAI Codex CLI - generates AGENTS.md from CLAUDE.md, provides Codex CLI execution helpers, and enables seamless interoperability between both tools
skill-sync
KyleKing
Syncs Claude Skills with other AI coding tools like Cursor, Copilot, and Codeium by creating cross-references and shared knowledge bases. Invoke when user wants to leverage skills across multiple tools or create unified AI context.
git-commits
bonny
Create well-structured git commits in logical chunks following best practices