Use after materializing the exact unresolved path set. Preserve both intents, edit only conflicted paths, run normal CI afterward, and never delete or force-push permanent branches.
Scanned 9/19/2026
Skills Directorynpx -y skills add the-vibey-project/vibey --skill conflict-resolution --agent claude-codeInstalls into .claude/skills of the current project.
Are you the author of Conflict Resolution?
Add the live security badge to your README — it updates automatically with every re-scan.
[](https://www.skillsdirectory.com/skills/the-vibey-project-conflict-resolution)More formats (shields.io, HTML) on the badges page. Keep it an A: scan every change in CI with Pro.
# Conflict resolution
Use after materializing the exact unresolved path set. Preserve both intents, edit only
conflicted paths, run normal CI afterward, and never delete or force-push permanent branches.
Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.
No comments yet. Be the first to comment!
