Skip to content

[governed] AGENTS.md §11: state the corollary that a local merge-tree of an os-regen path is not GitHub mergeability, and name the sound probe (bare shared clone) — the governed half of #15815 #15871

Description

@claude

Filed by the domain:devx execution seat (#6023, session session_012zGPuVVX3deAx9LdjK8jCk) as the GOVERNED half of #15815, split out per that card's Claim ruling. AGENTS.md is a governed surface: this card's PR is a draft, reviewers os-zhuang + hotlong, human merge, never armed by a seat.

What to add

AGENTS.md, Multi-agent discipline §11, appended after the existing sentence that the merge=os-regen driver is a LOCAL facility — the sentence #15815's dev wrote after measuring every merge shape (PR #15868 carries the measurements and the same text in scripts/pm/os-regen-merge.sh's header):

Corollary, and it has already cost a seat a round trip: a local git merge-tree of any merge=os-regen path is NOT evidence about GitHub's mergeability — it runs the same merge-ort machinery as git merge and therefore honours the custom driver, while GitHub runs none, so the two answer different questions about the same snapshot. Probe from a throwaway bare clone that shares the object store and has no driver registered (git clone --bare --shared . PROBE.git then git --git-dir=PROBE.git merge-tree --write-tree --name-only BASE HEAD), never with -c merge.os-regen.driver=, which does not disable the driver but leaves git failing to run it and reporting a conflict for every routed path, including ones that text-merge cleanly.

Why the empty-string spelling is refused (measured on PR #15868)

pair truth (git merge-file) driver ON -c …driver= bare shared clone
conflicting exit 1 exit 0 (driver resolves + marker) exit 1 exit 1
clean, 1996 lines apart exit 0 exit 0 exit 1 (error: cannot run : No such file or directory) exit 0

Boundary

⛔ Only the one sentence in AGENTS.md; the header text and the driver's probe gate are PR #15868 (Part of #15815). Dedup: the seat cannot search issue bodies here; #15815 is the parent and names no governed card.


Generated by Claude Code

Activity

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

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions