Skip to content

docs: record the two-lineage invariant in CLAUDE.md #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saagpatel merged 3 commits into from
Sep 5, 2026
Merged

docs: record the two-lineage invariant in CLAUDE.md #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f34a13
docs: record the two-lineage invariant in CLAUDE.md
Sep 5, 2026
4c5cf43
docs: name the local and remote branches of each lineage explicitly
Sep 5, 2026
6e09243
docs: identify lineages by remote ref; local names vary by checkout
Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# CLAUDE.md

Two disjoint git lineages by design, and local branch names differ between checkouts, so identify a lineage by its remote ref. Remote `main` is the release lineage: the tree the public site serves, with no `prep/` or `SPEC.md`. Remote `recovery/operator-os-explainer-main-20260719` is the dev lineage, where the build documents live. The two share no merge base. In the publishing checkout that RELEASE.md describes, local `main` is dev and local `release` is the release lineage; in other clones local `main` may track remote `main`. Run `git rev-parse --abbrev-ref @{u}` before acting on a branch name. Publishing copies a tree from dev onto the release lineage; never merge, rebase, or cherry-pick between them, and do not read the missing merge base as a broken repo. Whether the dormant dev branches stay on the public remote is the operator's decision; do not resolve it. Details in RELEASE.md; design sources live in the sibling operator-os-explainer-design directory.