Merge conflict resolution
Skill anur4ag/pr-completion/skills/merge-conflict-resolution
Safely resolve Git merge, rebase, cherry-pick, or revert conflicts by understanding both sides and validating the result. Use for conflicted branches, upstream updates, or stuck continuation operations.From its SKILL.md
npx -y skills add anur4ag/pr-completion --skill merge-conflict-resolutionAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 3 stars3 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
SKILL.md
1.4 KB, as published. Nobody here has run it
Merge Conflict Resolution
Workflow
- Snapshot
git status, the active operation, and unmerged paths withgit diff --name-only --diff-filter=U. Read repository instructions. - For each conflict, inspect the working tree plus base, ours, and theirs when available:
git show :1:path,:2:path, and:3:path. - Reconstruct both intents from nearby code, call sites, types, tests, and recent commits. Do not choose a side merely because it compiles.
- Preserve the correct combined behavior, local style, and unrelated user changes. Remove every conflict marker.
- Ask only when code and history cannot resolve a product or architecture choice.
- Run
git diff --check, focused validation for touched behavior, and broader checks when shared contracts changed. - If continuation is authorized, stage only resolved files and use the appropriate non-interactive merge/rebase/cherry-pick/revert continuation. Do not continue while required validation fails.
Never use destructive recovery commands, discard unrelated changes, or hide semantic uncertainty. Report files resolved, key decisions, validation, continuation state, and remaining blockers.