diff options
| author | Claude <noreply@anthropic.com> | 2026-04-23 23:10:11 +0000 |
|---|---|---|
| committer | Claude <noreply@anthropic.com> | 2026-04-23 23:10:11 +0000 |
| commit | e1db9200e9d44c10450361cc8984a45b2eda87b7 (patch) | |
| tree | 21bdfca02491e6ff4cde7a22673c821c0a03e108 /.agent/config.md | |
| parent | 55509f579b4d074f01237dd90791b6d25aaec3cd (diff) | |
| parent | eb78d317c722234a7ef2c501c68c9aa730ec2758 (diff) | |
Merge origin/main — unite all work onto one branch
Brings in dev log (NavLogger), UnitPrefs, MapLayerManager, HUD views,
conditions throttling, track save/load pipeline, improved ParticleWindView
(antimeridian-aware, dynamic particle count), Snackbar error surfacing,
and all other main-branch work from the prior session.
Combined with master's hardware source flags, vessel registry, crew
management, thermal alarm, CPA collision alerts, and track stats.
Also documents primary branch policy in CLAUDE.md and .agent/config.md:
all work merges to main, never master.
https://claude.ai/code/session_011h2dXbgXg3PesQMmQUNTCW
Diffstat (limited to '.agent/config.md')
| -rw-r--r-- | .agent/config.md | 13 |
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). |