Commit c9bafab
Teach the shared-refs family rule at recipe level in os-dev.md and platform-readings (#11137)
git worktree isolates the working tree and HEAD, and nothing else under
.git/ — refs (including refs/remotes/*), the stash stack, config and hooks
are common to every worktree. os-dev.md now states the family rule once
(folding the stash clause into it), records BASE=$(git rev-parse HEAD) at
branch time in the worktree recipe, and anchors "where I started"
reset/diff/log/rebase to the recorded "$BASE", never to origin/main — a
shared pointer another agent's fetch advances, whose soft reset stages
their merged files as yours while reporting success. platform-readings
gains the measured fact row. Ceilinged files pay by in-file deletion of
genuine duplicates and land exactly at their ceilings (399, 134).
Claude-Session: https://claude.ai/code/session_01MsbKEG4LtERSLaDrbehM3e
Co-authored-by: Claude <noreply@anthropic.com>1 parent 208bd22 commit c9bafab
2 files changed
Lines changed: 17 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
87 | | - | |
88 | | - | |
| 88 | + | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
94 | | - | |
| 93 | + | |
95 | 94 | | |
96 | 95 | | |
97 | 96 | | |
| |||
186 | 185 | | |
187 | 186 | | |
188 | 187 | | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
194 | 198 | | |
195 | 199 | | |
196 | 200 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | | - | |
| 14 | + | |
| 15 | + | |
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
| |||
93 | 92 | | |
94 | 93 | | |
95 | 94 | | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
0 commit comments