132dac0a2e
Rewrite DEPLOYMENT.md to reflect current state (CI/CD, backups, merge strategy). Expand CI paths-ignore to skip docs, license, gitignore, and deploy workflow changes. Add merge strategy to CLAUDE.md. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
16 lines
874 B
Markdown
16 lines
874 B
Markdown
# 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).
|
|
|
|
# Instructions
|
|
|
|
- After completing a task, always ask the user if they'd like to commit the changes.
|
|
- 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.
|