Skip to content

Open research PRs #8–#12 all conflict with each other #14

Closed

Description

@ahrazzle

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:

  1. The end of tests/checks.mjs, just above the final pass/fail lines.
  2. 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.
  3. The one-line const api = { ... } at the end of witness-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:

Whichever lands second has to settle the physics, not just the text.

Proposal

Needs A's call on the order and on README point 3.

Activity

  1. zero-aska commented on Oct 18, 2026

    @zero-aska
    Contributor

    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:

    What this means for open work:

    Closing, since everything here is done and #12 carries the rest.


    Generated by Claude Code

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions