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/<description> 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