From 0e1a9f447336c7006ae63f19aa4a304e0e68cf4e Mon Sep 17 00:00:00 2001 From: CTO Agent Date: Mon, 30 Mar 2026 23:42:41 -0400 Subject: [PATCH] chore: update CLAUDE.md with explicit git-flow workflow rules Adds pull-before-branch, branch naming, and rebase-before-push rules to the existing Git section per company-wide standard. Also corrects default branch references from main to prod. Co-Authored-By: Paperclip --- CLAUDE.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index fed46b78d..1bf81bdf8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -88,9 +88,26 @@ src/ ## Git -- `main` — production, `develop` — active development -- PR target: `main` +- `prod` — production, `develop` — active development +- PR target: `prod` - Commit messages: conventional commits — `type(scope): description` (e.g. `fix(timeline):`, `feat(export):`) +- **Always fetch and pull before branching:** + ```bash + git fetch origin + git checkout prod + git pull origin prod + ``` +- **Create feature branches from up-to-date `prod`:** + ```bash + git checkout -b feature/ prod + ``` +- **Branch naming:** `feature/*`, `fix/*`, `chore/*` +- **Rebase before pushing:** + ```bash + git fetch origin + git rebase origin/prod + ``` +- **Never commit directly to `prod` or `develop`** — always use feature branches + PRs ## Gotchas