diff --git a/CLAUDE.md b/CLAUDE.md index e6d2923b14..c5b55cbfc1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -29,14 +29,14 @@ The Apollo rules below take precedence over anything inherited from upstream. ## Branches -- `m1-wled-update`: the M-1 product branch today (WLED v16.0.1 + M-1 work, tag m1-b8). - Deletion and force-push are blocked. -- `main`: still the 2026-07 upstream 17.0.0-dev snapshot plus the install-page workflow. - Do not build or branch from it. It is due to become the product branch (pointed at - m1-wled-update's history), which needs an org owner to switch the default branch for - the move; until then the install page deploys from it unchanged. -- `archive/main-upstream-snapshot-2026-07`: a copy of the current `main`, kept for when - `main` moves. +- `main`: the M-1 product branch (since 2026-10-22: WLED v16.0.1 + M-1 work, tag m1-b8) + and the default branch. Changes go through pull requests; deletion and force-push are + blocked. The install page deploys from it. +- `m1-wled-update`: the former product branch, frozen read-only at 30e8a0ed (the commit + `main` took over) so old links and docs that name it still resolve. Do not use it. +- `archive/main-upstream-snapshot-2026-07` and `archive/main-before-product-2026-10-22`: + the previous `main` (an upstream 17.0.0-dev snapshot plus the install-page workflow), + frozen and kept for reference. ## Shipping: keep the install page and the flash script working diff --git a/PROGRESS.md b/PROGRESS.md index 483435cd2e..377febf500 100644 --- a/PROGRESS.md +++ b/PROGRESS.md @@ -31,12 +31,11 @@ BENCH_SESSION_D10.md (chains), BENCH_SESSION_AP.md (AP mode + first-run). ## Canonical locations - THIS repo: /Users/justinapollo/Code/ApolloAutomation/WLED-M1 = clone of ApolloAutomation/WLED-M1 (public GitHub fork of wled/WLED). UPDATED 2026-10-22: - m1-wled-update is the M-1 product branch (deletion and force-push blocked). - `main` is still the 2026-07 upstream snapshot hosting the install-page workflow; - moving the product onto `main` waits on an org owner (default-branch switch). - A copy of the current main is kept as archive/main-upstream-snapshot-2026-07. - hub75-first-boot-defaults was deleted (upstream PRs withdrawn). Never force push. - Nothing goes to upstream WLED. See CLAUDE.md. + `main` is the M-1 product branch and the default (it took over m1-wled-update's + history at 30e8a0ed). m1-wled-update is frozen read-only. The previous main is kept + as archive/main-upstream-snapshot-2026-07 and archive/main-before-product-2026-10-22. + hub75-first-boot-defaults was deleted (upstream PRs withdrawn). Changes reach main + through PRs. Never force push. Nothing goes to upstream WLED. See CLAUDE.md. - Old clone /Users/justinapollo/Code/ApolloAutomation/WLED: retired source of the recovered work (branches apollo/m1, hub75-first-boot-defaults; its linked worktree ../WLED-upstream-pr belongs to it). Read-only; upstream push disabled in