From autonomous-dev
This skill should be used when the user asks to "resolve merge conflicts", "fix git conflicts", "merge branches", or when autonomous-dev encounters merge conflicts during branch integration. Intelligently resolves git conflicts or escalates to user when uncertain.
How this skill is triggered — by the user, by Claude, or both
Slash command
/autonomous-dev:skills/conflict-resolverThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
Resolve git merge conflicts intelligently, with safe fallback to user input when uncertain.
Resolve git merge conflicts intelligently, with safe fallback to user input when uncertain.
List all files with merge conflicts:
git diff --name-only --diff-filter=U
For each conflicted file:
Select strategy based on conflict type:
| Conflict Type | Strategy |
|---|---|
| Additive changes | Both add different things → keep both |
| Same location, different code | Understand intent, merge logic |
| Conflicting imports | Combine import lists |
| Style conflicts | Use project lint/format to normalize |
After resolving:
git add <resolved-file>
Finalize the merge commit:
git commit --no-edit
Critical rule: Never guess on complex conflicts.
When uncertain about resolution:
Combine import statements:
// HEAD
import { ComponentA } from './components';
// Incoming
import { ComponentB } from './components';
// Resolution
import { ComponentA, ComponentB } from './components';
Keep both functions when they don't overlap:
// HEAD adds functionA
// Incoming adds functionB
// Resolution: keep both
Analyze intent and merge carefully:
Do NOT use this skill when:
git diff --name-only --diff-filter=U returns filesFor detailed conflict patterns:
references/conflict-patterns.md - 7 common conflict patterns with resolution strategies and auto-resolve safety ratingsnpx claudepluginhub adiomas/claude-code-adiomas-plugins --plugin autonomous-devAnalyzes git merge conflicts by type and context, proposes automated/manual resolutions, and validates fixes. Handles content, structural, semantic, and formatting issues.
Resolves in-progress git merge or rebase conflicts by understanding intent, preserving both sides where possible, and running automated checks.
Resolves Git merge and rebase conflicts efficiently using bulk strategies like `git checkout --theirs/--ours` over manual conflict marker editing. Activates on merge/rebase conflicts.