Commit ca2088e
committed
docs(agents): state the corollary that a local
AGENTS.md §11 already says the `merge=os-regen` driver is a LOCAL facility. What
it never stated is the corollary that costs a seat a round trip: a local
`git merge-tree` of a routed path runs the same merge-ort machinery as
`git merge`, so it HONOURS the driver, while GitHub runs none — the two answer
different questions about the same snapshot.
The added bullet names the sound instrument (a throwaway bare clone sharing the
object store, where the driver is genuinely absent, which is GitHub's actual
condition) and refuses the falsified `-c merge.os-regen.driver=` spelling, whose
empty string 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. Measurements are on PR #15868, which carries the same text in
`scripts/pm/os-regen-merge.sh`'s header.
Part of #15815
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012zGPuVVX3deAx9LdjK8jCkmerge-tree of an os-regen path is not GitHub mergeability, and name the sound probe (#15871)1 parent ef3a138 commit ca2088e
1 file changed
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
650 | 650 | | |
651 | 651 | | |
652 | 652 | | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
653 | 663 | | |
654 | 664 | | |
655 | 665 | | |
| |||
0 commit comments