Repository navigation
Commit 1a0c04f
committed
chore(merge-driver): say what the scratch merge measured about the guide's removed route
A merge made from a checkout carrying the new .gitattributes conflicts on the
stub. A branch forked before this change still defers the guide on its first
merge of main, because git reads routes from the merging checkout; the merged
tree has no row to discharge the deferral against, so the next commit and the
push are refused where, with the route, they passed and the stub was lost.
Claude-Session: https://claude.ai/code/session_01VZqqwTj2wsihZEbfT6yyYN
Co-authored-by: Claude <noreply@anthropic.com>1 parent fb96a94 commit 1a0c04f
2 files changed
Lines changed: 13 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
45 | 50 | | |
46 | 51 | | |
47 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
932 | 932 | | |
933 | 933 | | |
934 | 934 | | |
935 | | - | |
936 | | - | |
937 | | - | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
938 | 939 | | |
939 | 940 | | |
940 | 941 | | |
| |||
0 commit comments