Skip to content
Back to skills

Conflict Resolution

ASecurity

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.

  • 2 stars
  • 0 votes
  • 0 copies
  • 1 view
  • Added September 19, 2026
ai-agents

Security analysis

A100/100

Scanned September 19, 2026

npx -y skills add the-vibey-project/vibey --skill conflict-resolution --agent claude-code

Installs into .claude/skills of the current project.

Are you the author of Conflict Resolution?

Add the live security badge to your README. It updates with every re-scan.

Security grade badge for Conflict Resolution
[![Security: A — Skills Directory](https://www.skillsdirectory.com/api/skills/the-vibey-project-conflict-resolution/badge)](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.

Download with Pro
SKILL.md
# 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.

Attribution

the-vibey-projectView sourceSee grades on GitHubMore from the-vibey-project

Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.

Comments

Loading comments…