The weekly upstream sync hard-failed whenever upstream touched files the
fork diverges on (README branding) or removed a now-generated file
(tests/operations/index.mjs). It also had a latent bug: the workflow
restore ran 'git checkout HEAD -- .github/workflows/' *after* the merge
had already auto-committed, so HEAD was the merge commit and the restore
was a no-op.
- Merge with --no-commit so HEAD stays the pre-merge fork commit, making
the workflow restore actually keep the fork's workflows.
- Auto-resolve the two recurring conflicts: keep the fork's README, and
honour upstream deletions of generated/gitignored files.
- Fail loudly (and abort the merge) on any other, unexpected conflict
instead of pushing a half-resolved tree.
- Exit cleanly when already up to date.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1045fcc3c5