Merge Conflict Discipline

Resolve merge conflicts by intent (never blind accept-ours/theirs) AND prevent them structurally — integrate, never clobber.

selamy-labs Updated 0 repo stars

File contents

selamy-labs/agent-skills commit c2761142b1

Frequently asked questions

npx get-skill add selamy-labs/merge-conflict-discipline