Repository navigation
Closed
Labels
needs decisionNeeds A's callNeeds A's call
Description
What
Every pair of the five research PRs conflicts (git merge-tree, PR heads as of 18 October 2026):
| #9 | #10 | #11 | #12 | |
|---|---|---|---|---|
| #8 | C T | C T | C R T | C T |
| #9 | C R I T M | C R T M | C T M | |
| #10 | C R T M | C R T M | ||
| #11 | C T M |
C = CORRECTIONS.md, R = README.md, I = index.html, T = tests/checks.mjs, M = witness-map/model.js. #7 also conflicts with #10, in witness-map/table.mjs. #6 conflicts with nothing.
Merged one after another onto main, #6, #7 and #9 go in clean; each of #8, #10, #11 and #12 then needs a hand resolution.
Why
Three places every study adds to:
- The end of
tests/checks.mjs, just above the final pass/fail lines. CORRECTIONS.md: Gravitational atom beside hydrogen, at the same scale #8, Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10, Black hole and wave dark matter lensing: estimate, literature, lens list #11 and Bound gravity-only witnesses for dark matter (issue 3) #12 each add an item numbered 5 under 16 October, and Re-check the model against Joos-Zeh, Schlosshauer and the C70 heating experiment #9 adds its own heading with items 5 to 11.- The one-line
const api = { ... }at the end ofwitness-map/model.js, which Re-check the model against Joos-Zeh, Schlosshauer and the C70 heating experiment #9, Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10, Black hole and wave dark matter lensing: estimate, literature, lens list #11 and Bound gravity-only witnesses for dark matter (issue 3) #12 each extend.
Most of that is mechanical: keep both sides and renumber. One part is not. #10 and #12 both rewrite README point 3 about dark matter's witnesses, and they disagree:
- Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10: "A lone dark matter particle has no witnesses at any gap or particle mass." It retracts "part of what makes a galaxy-sized dark matter wave possible" (its CORRECTIONS item 5).
- Bound gravity-only witnesses for dark matter (issue 3) #12: a lone 100 GeV particle is witnessed at kiloparsec gaps (W ~ 10⁴², by passing stars), and it keeps "part of what makes a galaxy-sized dark matter wave possible".
Whichever lands second has to settle the physics, not just the text.
Proposal
- Each study keeps its checks in its own file under
tests/, andnpm testruns them all. A PR follows that addstests/run.mjs; it merges cleanly with every open PR, andtests/checks.mjsstays where it is. -
CORRECTIONS.md: give items their numbers at merge time, not while drafting. Alternatively, each PR puts its items under a dated heading of its own, as Re-check the model against Joos-Zeh, Schlosshauer and the C70 heating experiment #9 does. -
witness-map/model.js: one export per line inapi, so that additions do not touch the same line. - Merge order: Run the checks on every pull request #6, table.mjs: reject unknown surroundings and bad gaps #7 and Re-check the model against Joos-Zeh, Schlosshauer and the C70 heating experiment #9 first (all clean). Then Gravitational atom beside hydrogen, at the same scale #8 (mostly a new directory; only C and T conflict). Then Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10 and Black hole and wave dark matter lensing: estimate, literature, lens list #11, with Bound gravity-only witnesses for dark matter (issue 3) #12 last, as its reviewer suggests. Gravitational atom beside hydrogen, at the same scale #8 and Black hole and wave dark matter lensing: estimate, literature, lens list #11 carry two copies of the gravitational-atom algebra (
atom.jsandgravAtom), and both reviews ask whichever lands second to reconcile them.
Needs A's call on the order and on README point 3.
Metadata
Metadata
Assignees
Labels
needs decisionNeeds A's callNeeds A's call
Activity
zero-aska commentedon Oct 18, 2026
Resolved in the order proposed here. Each PR passed review by an agent that did not draft it.
Conventions now on main, for anything still open:
tests/.npm testruns them all.tests/checks.mjsholds only the Witness Map checks. Gravitational atom beside hydrogen, at the same scale #8, Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10 and Black hole and wave dark matter lensing: estimate, literature, lens list #11's checks moved verbatim togravitational-atom.mjs,crowd.mjsandbh-lensing.mjs.## <date>: <study> (issue #N)), numbered at merge time. The list now runs 1–15.apiinwitness-map/model.js: one line per study, not one per export. A new study adds its own line. Adding to an existing line still conflicts, so it is better avoided.gravAtomandgravitational-atom/atom.js: still two copies, buttests/bh-lensing.mjsnow fails if they disagree.What this means for open work:
gravScatterchecks go in their own file, its CORRECTIONS item under its own heading,gravScatteron its ownapiline. The physics blocker in its second review still stands. README point 3 on main is Crowd wave: coherence clocks of a wave dark matter halo, and where the map stops #10's wording; that review's suggested fix would bring Bound gravity-only witnesses for dark matter (issue 3) #12 into agreement with it.issue-16andissue-17merge onto main with a conflict only in CORRECTIONS.md: put the items under a heading of their own and number from 16.Closing, since everything here is done and #12 carries the rest.
Generated by Claude Code