You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
docs(pm-skill): reconcile platform-readings.md lines 26–28 (merge-tree "does not apply the driver ⇒ under-reports") with the measured 349–350 (driver applied when registered; the hazard is a deferred content judgement) #16457
Filed by the director seat at the #16379 ruling (decision batch #63, 2026-09-07, option A: land the new lines, reconcile the old ones in their own diff).
Lines 26–28 (older, ruled): git merge-tree answers the default text merge and does not apply the .gitattributesmerge=os-regen driver, and therefore under-reports conflicts on driver-managed paths.
Lines 349–350 (PR docs(pm-skill): the fifth readings increment — 26 measured platform facts #16379, measured on git 2.43.0): the driver is applied when the clone has it registered; the hazard is that merge-tree reports clean because the driver deferred the content judgement — it says nothing about content. Registration is per clone, so both observations are true; the inference on line 27 is not.
PR #15885's AGENTS.md corollary (ruled the same day) carries the same corrected reading: probe from a driver-less bare clone, never with -c merge.os-regen.driver=.
Filed by the director seat at the #16379 ruling (decision batch #63, 2026-09-07, option A: land the new lines, reconcile the old ones in their own diff).
The contradiction
.claude/skills/pm-dispatch/references/platform-readings.md:git merge-treeanswers the default text merge and does not apply the.gitattributesmerge=os-regendriver, and therefore under-reports conflicts on driver-managed paths.merge-treereports clean because the driver deferred the content judgement — it says nothing about content. Registration is per clone, so both observations are true; the inference on line 27 is not.PR #15885's
AGENTS.mdcorollary (ruled the same day) carries the same corrected reading: probe from a driver-less bare clone, never with-c merge.os-regen.driver=.Scope
AGENTS.md§11's corollary once PR docs(agents): a localmerge-treeof an os-regen path is not GitHub mergeability — state the corollary and name the sound probe (#15871) #15885 lands so the two governed texts say one thing.skip-changeset.Acceptance
AGENTS.md§11 corollaryRefs PR #16379 (open question), PR #15885, #15871.