pokemon/nuzlocke-tracker
1
1
Fork 0
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

feat: enforce feature branch workflow with PreToolUse hook

Browse Source 
Add a guard script that blocks git commit/push on protected branches
(develop, main, master) via a PreToolUse hook. Update CLAUDE.md with
stricter branching rules: one commit per task, immediate commits on
feature branches, no direct commits to protected branches.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Julian Tabel
2026-03-21 10:45:58 +01:00
parent 93a90f4ba7
commit 0d6174067e
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CLAUDE.md
View File

@@ -1,11 +1,15 @@
# Branching Strategy
- **Never commit directly to `develop` or `main`.** Always create a `feature/*` branch first.
- When starting an **epic**, create `feature/<epic-title-slug>` off `develop`
- When starting a **standalone task/bug** (no parent epic), create `feature/<task-title-slug>` off `develop`
- Each task within an epic gets its own commit(s) on the epic's feature branch
- Branch naming: use a kebab-case slug of the bean title (e.g., `feature/add-auth-system`)
- When the epic/task is complete, squash merge into `develop`
- **NEVER commit or push directly to `develop` or `main`.** These branches are protected. All work happens on `feature/*` branches.
- **Every epic** gets its own feature branch: `feature/<epic-title-slug>` off `develop`
- **Every standalone task/bug** (no parent epic) gets its own feature branch: `feature/<task-title-slug>` off `develop`
- Branch naming: kebab-case slug of the bean title (e.g., `feature/add-auth-system`)
## Committing workflow
- **Every completed task gets its own commit** on the feature branch — including tasks within an epic. One task = one commit.
- After finishing a task, **immediately commit** the changes to the feature branch. Do not batch multiple tasks into a single commit.
- When the epic or standalone task is fully complete, squash merge the feature branch into `develop` (via PR).
# Pre-commit Hooks
@@ -21,7 +25,7 @@ Frontend hooks require `npm ci` in `frontend/` first (they use `npx` to run from
# Instructions
- After completing a task, always ask the user if they'd like to commit the changes.
- After completing a task, immediately commit the changes to the current feature branch and ask the user to confirm.
- Before working on a bean, always set it to in-progress. After the changes related to the bean are committed, mark it as completed.
- If a bean is marked as draft, refine it first before starting work on it.
- When completing a bean that has a parent (epic, feature, etc.), check the parent's checklist/success criteria for items that can now be marked as completed and update them.