Commit 1a07ebb
committed
ci: keep pinned-config swap invisible to git in merge-queue job
The cp on its own left .mdsmith.yml dirty in the runner's
checkout; merge-queue-action performs local checkout/merge
operations after the merge driver is installed, and git would
either refuse those with "local changes would be overwritten"
or silently restore the new-shape config mid-merge — at which
point the pinned binary stops being able to parse it.
`git update-index --skip-worktree .mdsmith.yml` after the cp
tells git to treat the file as unchanged. `git status` reports
the worktree clean, branch switches and patch applies leave
the swapped content alone, and the merge driver continues to
see the pre-156 shape for the whole job lifetime.
https://claude.ai/code/session_012GGH62fZUzLuzP8T4ocGkJ1 parent 54b5569 commit 1a07ebb
1 file changed
Lines changed: 11 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
46 | | - | |
47 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
48 | 53 | | |
49 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
50 | 57 | | |
51 | 58 | | |
52 | 59 | | |
| |||
0 commit comments