docs(esm_catalog): PR-C3 — add canonical ARCHITECTURE.md#1496
Open
siligam wants to merge 1 commit into
Open
Conversation
siligam
force-pushed
the
esm-catalog/pr-c2-personal-collections
branch
from
June 14, 2026 00:13
986cbba to
422c646
Compare
siligam
force-pushed
the
esm-catalog/pr-c3-docs
branch
from
June 14, 2026 00:13
2f5a949 to
482b2fb
Compare
siligam
force-pushed
the
esm-catalog/pr-c2-personal-collections
branch
from
June 17, 2026 12:14
422c646 to
e2e2e23
Compare
siligam
force-pushed
the
esm-catalog/pr-c3-docs
branch
from
June 17, 2026 12:14
482b2fb to
9a3c072
Compare
siligam
force-pushed
the
esm-catalog/pr-c2-personal-collections
branch
from
June 17, 2026 16:01
e2e2e23 to
4b1519f
Compare
siligam
force-pushed
the
esm-catalog/pr-c3-docs
branch
from
June 17, 2026 16:02
9a3c072 to
ff8520e
Compare
siligam
force-pushed
the
esm-catalog/pr-c2-personal-collections
branch
from
June 17, 2026 16:34
4b1519f to
57a7f07
Compare
siligam
force-pushed
the
esm-catalog/pr-c3-docs
branch
from
June 17, 2026 16:34
ff8520e to
d062585
Compare
Adds the 1247-line ARCHITECTURE.md to the PR stack. This resolves the case-collision (ARCHITECTURE.md vs architecture.md) that plagued the collapsed-collections branch on macOS: by only committing the single canonical UPPERCASE filename, the new PR stack is collision-free. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
siligam
force-pushed
the
esm-catalog/pr-c2-personal-collections
branch
from
June 17, 2026 17:03
57a7f07 to
2eec95a
Compare
siligam
force-pushed
the
esm-catalog/pr-c3-docs
branch
from
June 17, 2026 17:03
d062585 to
51f9859
Compare
Contributor
Author
|
Rebased onto the corrected PR-0 base (#1483) — test relocation to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds the single canonical
src/esm_catalog/ARCHITECTURE.md(1247 lines) to the PR stack.Background on the case-collision: The
collapsed-collectionsbranch inadvertently has bothARCHITECTURE.md(1247 lines, added in "wip: some things for pavan") andarchitecture.md(499 lines, added later in "feat: experiment hierarchy API"), which differ only by case. On macOS's case-insensitive HFS+/APFS filesystem this causes:git rebase/checkout/cherry-pickto fail on clean-tree checksgit showcall winsBy only adding
ARCHITECTURE.md(uppercase, the more complete version) in the new PR stack and never addingarchitecture.md, the collision is naturally resolved going forward.Test plan
pytest src/esm_catalog/tests/— 162 total green (docs-only change, no test impact)git ls-tree HEAD:src/esm_catalog/ | grep -i archshows exactly one entryesm-catalog-testspassesStack position
release→ PR-0 → A1a → A1b-1 → A1b-2 → A2 → A3 → A4 → B1 → B2 → B3 → B4 → C1 → C2 → C3 (this PR)Phase C complete after this PR.
🤖 Generated with Claude Code