Skip to content

Release v1.19.0#93

Closed
oerlandsen wants to merge 3 commits intostablefrom
release/1.19.0
Closed

Release v1.19.0#93
oerlandsen wants to merge 3 commits intostablefrom
release/1.19.0

Conversation

@oerlandsen
Copy link
Copy Markdown
Contributor

Summary

Release v1.19.0 — cherry-picks the post-1.18.0 commits onto stable.

Includes:

Why cherry-pick instead of merging master directly

The previous release PR (#88) was squash-merged, which collapsed the v1.18.0 commits into a single new commit on stable (737b163) with no graph link to master's 13e9945. Merging master → stable now would replay every commit since 352f867 and conflict against the squashed copy of those same changes.

This PR applies only the genuinely new commits (#89/#90/#91) on top of stable.

Important — merge with a merge commit, NOT squash

Use Create a merge commit when merging this PR. That records master's tip as a parent of stable, restoring the graph link so the next release PR has a clean merge base. Squashing again will reintroduce the drift.

Test plan

  • CI passes
  • Diff against stable shows only the three expected commits

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