summaryrefslogtreecommitdiff
path: root/.agent/config.md
diff options
context:
space:
mode:
Diffstat (limited to '.agent/config.md')
-rw-r--r--.agent/config.md13
1 files changed, 12 insertions, 1 deletions
diff --git a/.agent/config.md b/.agent/config.md
index 6094452..b3a28dc 100644
--- a/.agent/config.md
+++ b/.agent/config.md
@@ -14,7 +14,18 @@ This is the primary source of truth for all AI agents working on **Nav**. These
| `narrative.md` | **Background** — Historical context and evolution of the project. |
| `preferences.md` | **User Prefs** — Living record of user-specific likes/dislikes. |
-## 2. Core Mandates
+## 2. Branch Policy — READ THIS FIRST
+
+**Primary branch: `main`**
+
+- ALL work merges to `main`. Never to `master` or any other branch.
+- `master` does not exist as a development target. If it exists locally, ignore it.
+- Feature branches are cut from `main` and merge back to `main`.
+- When a session harness specifies a generated branch name (e.g. `claude/foo-XYZ`), develop there and merge to `main` when done — not to wherever the local HEAD points.
+- The CI/CD workflow targets `main`. Firebase distribution fires on `main` pushes only.
+- If you are ever unsure which branch to merge to: it is `main`.
+
+## 3. Core Mandates
### ULTRA-STRICT ROOT SAFETY PROTOCOL
1. **Inquiry-Only Default:** Treat every message as research/analysis unless it is an explicit, imperative command (Directive).