-
Notifications
You must be signed in to change notification settings - Fork 117
Open
Description
Summary
Merge the release/2.1 branch back into main to ensure all release changes and tags are reflected in the primary development branch.
Rationale
Keeping main up to date with the release branch ensures that hotfixes, version bumps, and changelog updates are preserved in ongoing development.
Proposed Steps
- Confirm the latest release branch name (
release/2.1or similar) and upstream tag (e.g.,v2.1.0) - Sync local branches and fetch latest tags
- Create a merge PR from
release/2.1->main - Resolve any conflicts (prefer changes from release branch for versioning and changelog)
- Ensure CI passes on the PR
- Merge with a merge commit (not squash) to preserve history
- Delete the release branch if appropriate (after merge)
Validation
-
CHANGELOG.mdincludes 2.1 entries onmain - Version numbers across language packages reflect 2.1
- Tags and release notes remain intact
Notes
If conflicts arise in language-specific modules (Go/Node/Python/Java), coordinate maintainers for sign-off.
/cc @jbrinkman
Metadata
Metadata
Assignees
Labels
No labels