From 2d9d2319a55490e7f632ff7c95c8e9354d33242e Mon Sep 17 00:00:00 2001 From: "bert.hausmans" Date: Mon, 4 May 2026 23:11:48 +0200 Subject: [PATCH] docs(claude): add post-merge feature-branch deletion to Git Commit Policy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After today's WS-6 feat-branch audit revealed ten stale branches that had been merged via squash/cherry-pick paths but never deleted, codify the cleanup expectation directly in CLAUDE.md. Each feature branch is expected to be deleted locally and on origin immediately after merge — not "eventually" — to prevent SHA-illusion confusion in future audits. Co-Authored-By: Claude --- CLAUDE.md | 6 ++++++ 1 file changed, 6 insertions(+) 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 `) and remotely (`git push origin --delete + `) 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`