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/preferences.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/preferences.md')
| -rw-r--r-- | .agent/preferences.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.agent/preferences.md b/.agent/preferences.md index 7ca21d6..6d1c4bb 100644 --- a/.agent/preferences.md +++ b/.agent/preferences.md @@ -5,3 +5,10 @@ Living record of user preferences for the Nav project. ## 1. Interaction & Workflow - **Safety First:** Cautious and deliberate action. - **Checkpoint Model:** Research -> Strategy -> GO. + +## 2. Repository Conventions — NON-NEGOTIABLE +- **Default branch is `main`.** Always has been, always will be. +- When the user says "main", "master", or "the default branch" they all mean `main`. +- **CI/CD (`.github/workflows/android.yml`) triggers on `main`.** Firebase App Distribution only fires on pushes to `main`. Never change the trigger branch without explicit instruction. +- Before any merge or push, verify: `git branch --show-current` is `main` and `git remote show origin | grep "HEAD branch"` shows `main`. +- Never create or develop on `master`. If `master` ever appears, rename it to `main` immediately. |