Last weird branch commit
This commit is contained in:
13
CLAUDE.md
13
CLAUDE.md
@@ -1,12 +1,11 @@
|
||||
# Branching Strategy
|
||||
|
||||
- **Never commit directly to `main`.** `main` is always production-ready.
|
||||
- Day-to-day work happens on `develop`.
|
||||
- New work is done on `feature/*` branches off `develop`.
|
||||
- Merge flow: `feature/*` → `develop` → `main`.
|
||||
- **Squash merge** `feature/*` into `develop` (one clean commit per feature).
|
||||
- **Merge commit** `develop` into `main` (marks deploy points).
|
||||
- Always `git pull` the target branch before merging into it.
|
||||
- **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`
|
||||
|
||||
# Pre-commit Hooks
|
||||
|
||||
|
||||
Reference in New Issue
Block a user