Skip to content

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

Description

@os-zhuang

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:

  • Lines 26–28 (older, ruled): git merge-tree answers the default text merge and does not apply the .gitattributes merge=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=.

Scope

Acceptance

  • 26–28 and 349–350 read as one rule with two clauses (registered clone vs driver-less clone)
  • no line-count change
  • wording agrees with AGENTS.md §11 corollary

Refs PR #16379 (open question), PR #15885, #15871.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions