Skip to content

docs(agents): a local merge-tree of an os-regen path is not GitHub mergeability — state the corollary and name the sound probe (#15871) #15885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claude wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Open

docs(agents): a local merge-tree of an os-regen path is not GitHub mergeability — state the corollary and name the sound probe (#15871) #15885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,16 @@ Even inside your own worktree, operate defensively:
(`authorable-surface/`, `json-schema.manifest/`, `api-surface/`) to keep parallel
spec PRs textually disjoint; every gate reads the whole directory as one set, so
ratchet semantics are unchanged (`packages/spec/scripts/lib/sharded-artifacts.ts`).
- **Corollary — a local `merge-tree` is NOT GitHub's mergeability**, and it has already
cost a seat a round trip: a local `git merge-tree` of any `merge=os-regen` path 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.
- **Registration is per clone** (`pnpm install` → `prepare` →
`scripts/setup-git-hooks.mjs`); an unregistered clone falls back to git's default
text merge — older behaviour, not breakage.
Expand Down
Loading