Skip to content
Back to skills

Conflict Resolution

ASecurity

This skill should be used when a pull request conflicts with its target branch and requires a guarded semantic resolution.

  • 2 stars
  • 0 votes
  • 0 copies
  • 0 views
  • 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-vibey/badge)](https://www.skillsdirectory.com/skills/the-vibey-project-conflict-resolution-vibey)

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
---
name: conflict-resolution
description: This skill should be used when a pull request conflicts with its target branch and requires a guarded semantic resolution.
---
# Conflict resolution

Materialize conflicts against the current base, enumerate unresolved paths, preserve both
intents, edit only the conflict set, and let normal CI validate. Never delete or rename a
permanent branch and never force-push.

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…