the-vibey-project

Conflict resolution

conflicted paths, run normal CI afterward, and never delete or force-push permanent branches.

the-vibey-project 3 2 Updated 1mo ago
GitHub

Install

npx skillscat add the-vibey-project/vibey/src-vibey-tools-gh-agents-skills-conflict-resolution

Install via the SkillsCat registry.

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.

Categories