diff --git a/.farhoodlabs/CLAUDE.md b/.farhoodlabs/CLAUDE.md index 033ae480..f57dbc07 100644 --- a/.farhoodlabs/CLAUDE.md +++ b/.farhoodlabs/CLAUDE.md @@ -10,7 +10,7 @@ Fork repo: https://github.com/farhoodlabs/paperclip | `master` | Mirrors `upstream/master` exactly + `.farhoodlabs/` overlay directory + `assemble-local.yml` action. Never commit application code here. | | `local` | **Default branch.** Assembled automatically by `assemble-local.yml` on every `master` push. Contains: upstream + fork Dockerfile/workflows + all pending upstream PR cherry-picks. Builds `ghcr.io/farhoodlabs/paperclip`. | | `dev` | Development branch based on upstream/master. Builds `ghcr.io/farhoodlabs/paperclip-dev` on every push. | -| PR branches | `skill-pat-feature`, `skill-scan-refresh`, `feat/company-portability-complete`, `fix/far-108-k8s-adapter-reaper-liveness` — open PRs to upstream, never rebase onto master/local. | +| PR branches | `skill-pat-feature`, `skill-scan-refresh`, `feat/company-portability-complete` — open PRs to upstream, never rebase onto master/local. | **Never commit directly to `local`** — it is fully regenerated by the assemble action and any direct commits will be overwritten. @@ -39,7 +39,6 @@ These are cherry-picked/squashed onto `local` by the assemble action. When upstr | #3237 | `skill-pat-feature` | cherry-pick | GitHub PAT support for private skill repos | | #3351 | `skill-scan-refresh` | cherry-pick (exclude: skill-pat-feature) | Rebased onto skill-pat-feature | | #3987 | `feat/company-portability-complete` | squash | Secrets export/import; squashed to bypass intra-PR merge commits | -| #4162 | `fix/far-108-k8s-adapter-reaper-liveness` | cherry-pick | K8s adapter reaper liveness | ## Common Tasks diff --git a/CLAUDE.md b/CLAUDE.md index 033ae480..f57dbc07 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ Fork repo: https://github.com/farhoodlabs/paperclip | `master` | Mirrors `upstream/master` exactly + `.farhoodlabs/` overlay directory + `assemble-local.yml` action. Never commit application code here. | | `local` | **Default branch.** Assembled automatically by `assemble-local.yml` on every `master` push. Contains: upstream + fork Dockerfile/workflows + all pending upstream PR cherry-picks. Builds `ghcr.io/farhoodlabs/paperclip`. | | `dev` | Development branch based on upstream/master. Builds `ghcr.io/farhoodlabs/paperclip-dev` on every push. | -| PR branches | `skill-pat-feature`, `skill-scan-refresh`, `feat/company-portability-complete`, `fix/far-108-k8s-adapter-reaper-liveness` — open PRs to upstream, never rebase onto master/local. | +| PR branches | `skill-pat-feature`, `skill-scan-refresh`, `feat/company-portability-complete` — open PRs to upstream, never rebase onto master/local. | **Never commit directly to `local`** — it is fully regenerated by the assemble action and any direct commits will be overwritten. @@ -39,7 +39,6 @@ These are cherry-picked/squashed onto `local` by the assemble action. When upstr | #3237 | `skill-pat-feature` | cherry-pick | GitHub PAT support for private skill repos | | #3351 | `skill-scan-refresh` | cherry-pick (exclude: skill-pat-feature) | Rebased onto skill-pat-feature | | #3987 | `feat/company-portability-complete` | squash | Secrets export/import; squashed to bypass intra-PR merge commits | -| #4162 | `fix/far-108-k8s-adapter-reaper-liveness` | cherry-pick | K8s adapter reaper liveness | ## Common Tasks