Skip to content

Commit 303d4be

Browse files
committed
docs: make edge the development branch
1 parent 52349d8 commit 303d4be

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

AGENTS.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,23 @@ or planning bead until the user has chosen that direction
1010

1111
## Git Workflow
1212

13-
Work directly on `main` by default. Do not create a separate branch unless the
14-
user explicitly requests one or another repository instruction requires it.
13+
Keep one linear history with this ancestry invariant:
1514

16-
`edge` is the opt-in channel for experimental dogfooding. Work on it only when
17-
the user explicitly chooses that channel. A change intended for release must
18-
land on `main` and follow the normal `stable` promotion contract; never promote
19-
`stable` directly from `edge`.
15+
```text
16+
stable ⊆ main ⊆ edge
17+
```
18+
19+
All tracked changes originate on `edge`, including fixes, reverts,
20+
documentation, and Beads updates. Work directly on `edge` by default. Do not
21+
create another branch unless the user explicitly requests one or another
22+
repository instruction requires it.
23+
24+
`edge` is the active development and experimental dogfood channel. `main` is a
25+
promotion-only accepted-development channel: do not commit on it directly.
26+
After an `edge` revision is accepted and verified for `main`, advance `main` to
27+
that exact revision with `git push origin <sha>:main`. Never create merge
28+
commits, rebase published channel history, or cherry-pick between the channel
29+
branches, and never promote `stable` directly from `edge`.
2030

2131
`stable` is a promotion-only user channel. Do not commit on it or advance it
2232
unless the user explicitly requests a promotion. A candidate must be a
@@ -25,8 +35,8 @@ Linux and cache checks, pass the release checks for its changed surface, and
2535
have fresh-session dogfood for user-visible runtime interaction changes. Do not
2636
promote a commit with a known P0 or P1 regression. Promote the exact verified
2737
SHA with `git push origin <sha>:stable`; never force-push or delete `stable`.
28-
Rollbacks use a new revert commit on `main`, followed by normal verification and
29-
promotion.
38+
Rollbacks use a new revert commit on `edge`, followed by normal verification and
39+
fast-forward promotion through `main` and then `stable`.
3040

3141
## Method
3242

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,6 @@ See [Development](docs/development.md) for CI and local checks,
359359

360360
## LOC Scorecard
361361

362-
Yazelix owns **25,905 lines** of tracked text project files. The
362+
Yazelix owns **25,915 lines** of tracked text project files. The
363363
[reproducible scorecard](docs/development.md#loc-scorecard) excludes Beads,
364364
lockfiles, and binary assets.

docs/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ git ls-files | grep -Ev '^\.beads/|\.lock$|^assets/' | xargs wc -l
100100
| --- | ---: |
101101
| Ignore (`.gitignore`) | 19 |
102102
| License | 201 |
103-
| Markdown | 2986 |
103+
| Markdown | 2996 |
104104
| Nix | 1606 |
105105
| Shell | 84 |
106106
| YAML | 456 |
@@ -110,4 +110,4 @@ git ls-files | grep -Ev '^\.beads/|\.lock$|^assets/' | xargs wc -l
110110
| Lua | 245 |
111111
| Rust | 19540 |
112112
| Text | 41 |
113-
| Total | 25905 |
113+
| Total | 25915 |

0 commit comments

Comments
 (0)