~ / leaderboard / skill / merge-conflict
Skill · #4756
merge-conflict
Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tes
4rigs use it
0%of all rigs
14.7kavg rig context tax
Get it
$ npx degit moah0911/aftermath/skills/merge-conflict .claude/skills/merge-conflict From the most-starred rig that ships it: moah0911/aftermath. Same-named skills in different rigs may differ — review before use.
Often used together with
grill-me · 2babysit-pr · 2silent-failure-hunter · 2vercel-react-best-practices · 1animate-expo · 1animate · 1animation-vocabulary · 1apple-design · 1mobile-native · 1improve-codebase-architecture · 1
Rigs using merge-conflict (4)
moah0911/aftermath
—
Pragmatist 538 tok · · Q15
timoclsn/dotfiles
My personal dotfiles.
MCP Hoarder 43.0k tok · · Q0
KhaledSaeed18/dotclaude
Reusable Claude Code extension registry. skills, subagents, slash commands, and hooks for engineering, git, testing, and security workflows. Distributed as a shadcn GitHub registry and as installable plugins.
Orchestrator 9.6k tok · · Q5
auerbachb/claude-code-config
CLAUDE.md config that teaches Claude Code to collaborate with CodeRabbit for automated PR planning, code review loops, and merge workflows
Orchestrator 5.6k tok · · Q20