Skip to content

chore: fix 2025-1-RC5 publish commit history - #272

Merged
ssteinbuss merged 3 commits into
mainfrom
fix/2025-1-rc5-unsquash
Aug 31, 2026
Merged

chore: fix 2025-1-RC5 publish commit history#272
ssteinbuss merged 3 commits into
mainfrom
fix/2025-1-rc5-unsquash

Conversation

@ssteinbuss

Copy link
Copy Markdown
Contributor

What this PR changes/adds

Corrects the merge of #270. That PR was squash-merged, which collapsed its
two intentional commits — one setting specStatus: "base" for the release
snapshot, one reverting it — into a single final-state commit. This dropped
the "base"-status commit entirely, so there is nothing on main that
2025-1-RC5 can correctly be tagged against.

This PR:

  1. Reverts 28911db ("chore: publish 2025-1-RC5 (chore: publish 2025-1-RC5 #270)")
  2. Cherry-picks the two original commits back individually

Net file content is unchanged — verified identical to current main via
git diff origin/main HEAD. Only the commit history is restored.

⚠️ Merge method

This PR must be merged with "Rebase and merge." Not squash — that's
exactly what caused this. Click the dropdown arrow next to the merge button
and select "Rebase and merge" explicitly.

Linked Issue(s)

Relates to #269

ssteinbuss and others added 3 commits August 31, 2026 12:46
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@ssteinbuss
ssteinbuss merged commit a2ec674 into main Aug 31, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants