diff --git a/CLAUDE.md b/CLAUDE.md
index da19522b..50627bfc 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -359,6 +359,12 @@ docs: short description of documentation changes
 test: short description of test additions
 ```
 
+- After a feature branch is merged into main, delete it locally
+  (`git branch -d <branch>`) and remotely (`git push origin --delete
+  <branch>`) immediately. Stale feature branches accumulate cognitive
+  load and obscure SHA-level history when squash-merges leave commit
+  hashes orphaned on the original branch.
+
 Examples:
 - `feat: person tags system with org-level skills and sync endpoint`
 - `fix: auth race condition on page refresh`