docs: the second website tree held a thousand lines nobody had pushed
This commit is contained in:
parent
b87e433ec7
commit
5bd12a7b18
1 changed files with 27 additions and 0 deletions
|
|
@ -105,3 +105,30 @@ Still open: the site has no contact, hire, or funding path, and no dated
|
|||
activity signal. Audit at `~/souveraineai-audit-2026-08-11.html` §04.
|
||||
|
||||
Connections: canonical map in `../AGENTS.md` §websites; empty.
|
||||
|
||||
## The second working tree — resolved 2026-08-12
|
||||
|
||||
`~/Projects/Web/souveraineai.com` was a second checkout of `souveraine-website`
|
||||
with its own `.git`, its own `origin` (HTTP, **plaintext token in the remote
|
||||
URL**), and six commits from 2026-08-10 that the remote had never seen. The
|
||||
2026-08-11 handoff listed it as "deploys nothing but reports success" and
|
||||
proposed deleting it.
|
||||
|
||||
It was not scratch. Blob-identity audit: 73 files, 30 unknown to the canonical
|
||||
object database; merge base `fee4e47` (May 14). Roughly a thousand lines of
|
||||
writing living on one disk, including a whole `docs/substrate/` section absent
|
||||
from `main`.
|
||||
|
||||
Pushed verbatim to `origin/rescue/aug10-expansion`; `main` untouched; the
|
||||
duplicate tree then verified fully-reachable and removed (209 M).
|
||||
|
||||
**Merging is open and belongs to Casey** — 31 files differ, 16 net-new, and the
|
||||
divergent pages are 3–7× longer. Full file inventory, ordering and the
|
||||
merge-direction trap (main holds the deploy-critical audit fixes, rescue holds
|
||||
the prose — never `-X theirs`) are in the Souveraine memory task
|
||||
`tasks/website-divergent-tree-merge-2026-08-12.md`.
|
||||
|
||||
The net-new pages are **not** separable from the merge as they first appear:
|
||||
they are Starlight content whose sidebar entries live in `astro.config.mjs`,
|
||||
which is itself conflicted. Dropping them in alone publishes unlinked pages on
|
||||
a site attached to soliciting funding.
|
||||
|
|
|
|||
Loading…
Reference in a new issue