mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-08 04:52:10 +00:00
bherbruck
74eb83a706
19 of the 41 conflicting open PRs conflicted only on plan/findings.md or
plan/upstream-issues.md: every PR appended to the same two files. The
merge=union attribute from fe4a9c142 only helps a local git merge; GitHub's
mergeability check and update-branch ignore it.
- New findings go in plan/findings/<unit>--<slug>.md, new upstream issues in
plan/upstream-issues/<ID>--<slug>.md (format in each README.md).
- plan/findings.md and plan/upstream-issues.md become frozen archives.
- site/build.py renders the archive plus every per-issue file, in name order.
- AGENTS.md and README.md: never append to a shared file; registries and logs
are directories of per-entry files.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaDuBSC1mqS9DnQoEsr7LJ
6 lines
275 B
Plaintext
6 lines
275 B
Plaintext
# Frozen archives (new entries are one file each under plan/findings/ and
|
|
# plan/upstream-issues/). Kept so branches that still append here merge locally;
|
|
# GitHub's own mergeability check ignores merge=union.
|
|
plan/findings.md merge=union
|
|
plan/upstream-issues.md merge=union
|