CtrlK
BlogDocsLog inGet started
Tessl Logo

conflict-of-interest

github.com/Raudbjorn/conflict-of-interest

SkillAddedReview
git-conflict-resolver

SKILL.md

Resolve git conflicts (rebase, merge, cherry-pick, revert) using mergiraf, deterministic category handling, explicit intent inference, validation, and semantic-conflict auditing. Use when git status shows unmerged paths or an operation is paused with conflicts. Also decomposes an oversized PR or branch into smaller stacked PRs along functional/structural boundaries.

75