Garry Tan 827f63527d docs: add SKILL.md merge conflict directive to CLAUDE.md ...

When resolving merge conflicts on generated SKILL.md files, always merge
the .tmpl templates first, then regenerate — never accept either side's
generated output directly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-03-21 13:17:14 -07:00

..

SKILL.md

docs: add SKILL.md merge conflict directive to CLAUDE.md

2026-03-21 13:17:14 -07:00

SKILL.md.tmpl

feat: add /canary, /benchmark, /land-and-deploy skills (v0.7.0)

2026-03-17 23:01:10 -07:00