diff options
| author | Claude <noreply@anthropic.com> | 2026-05-26 07:15:38 +0000 |
|---|---|---|
| committer | Claude <noreply@anthropic.com> | 2026-05-26 07:15:38 +0000 |
| commit | e64d07cb49dd3313eb8595935777f31fdfb2f373 (patch) | |
| tree | 2c914f91120fec91e045ee422ec126342e8b8511 | |
| parent | 802834de74b9b2bcacf9d5dc9d09c9156e69bebc (diff) | |
Clarify merge policy: merge when done, not at session end
https://claude.ai/code/session_01YUbuZNDAoLea4cf9UGQ9qn
| -rw-r--r-- | .agent/preferences.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.agent/preferences.md b/.agent/preferences.md index f703998..9ae92fa 100644 --- a/.agent/preferences.md +++ b/.agent/preferences.md @@ -15,7 +15,7 @@ Living record of user preferences for the Nav project. ## 2. Merge Policy — NON-NEGOTIABLE - **Merge to `main` after every complete unit of work.** Nothing counts until it lands on `main` — that's when the user can test it. Don't batch up multiple tasks across a session and merge at the end. Each self-contained piece (a feature, a bug fix, a redesign) merges to `main` as soon as it's working and tested. - Feature branches are short-lived and merge-forward aggressively. Push the branch, then immediately merge it to `main` and push `main`. -- **Never leave a session with completed work sitting on a feature branch.** +- **Merge immediately when a task is done — not at session end, not during cleanup.** "Prep for new session" should never be the moment work first lands on main. ## 3. Repository Conventions — NON-NEGOTIABLE - **Default branch is `main`.** Always has been, always will be. |