Stats
Actions
Tags
From quick-review
Use this skill when the current branch has merge conflicts that need to be resolved.
How this skill is triggered — by the user, by Claude, or both
Slash command
/quick-review:conflictsThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
This branch has merge conflicts. Please take a look.
This branch has merge conflicts. Please take a look.
npx claudepluginhub hibukki/yonatans-cc-marketplace --plugin quick-reviewAnalyzes git merge conflicts by type and context, proposes automated/manual resolutions, and validates fixes. Handles content, structural, semantic, and formatting issues.
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.
Resolves git merge, rebase, or cherry-pick conflicts via a structural cascade: mergiraf (AST-aware auto-resolve), then git rerere, then kdiff3 as manual fallback. Includes squash-merge residue detection and helper scripts for batch resolution.