chore: merge release/2.43.0 into develop for tag ancestry#22138
Open
HashWrangler wants to merge 3 commits intodevelopfrom
Open
chore: merge release/2.43.0 into develop for tag ancestry#22138HashWrangler wants to merge 3 commits intodevelopfrom
HashWrangler wants to merge 3 commits intodevelopfrom
Conversation
Merges primary minor line release/2.43.0 so v2.43.0 semver tags are ancestors of develop for Go pseudo-version selection. Conflicts resolved in favor of current develop trunk (package.json/CHANGELOG). Co-authored-by: release-marshal <ops-control-plane>
Contributor
|
✅ No conflicts with other open PRs targeting |
HashWrangler
force-pushed
the
jd/chore-merge-release-2.43.0-develop-tag-ancestry
branch
from
353661b to
9a6512d
Compare
jmank88
approved these changes
Apr 22, 2026
chainchad
approved these changes
Apr 22, 2026
…ease-2.43.0-develop-tag-ancestry
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges the primary minor line branch
release/2.43.0intodevelopso 2.43.0 semver tags (GA and pre) are reachable indevelopancestry for Go module pseudo-version selection.Scope
release/2.X.0— hererelease/2.43.0only.2.44.0(handled elsewhere), patch/hotfix lines such asrelease/2.43.1/release/2.43.2(not in this change).Why
Without this merge,
v2.43.0,v2.43.0-rc.0, andv2.43.0-beta.0are not ancestors ofdevelopeven when trunk has moved forward. Go pseudo-version bases are derived from reachable semver tags in commit history, not from file-level parity or closed merge-back PRs.What changed in the tree
origin/release/2.43.0intodevelop(ancestry-preserving).developtrunk forpackage.json/CHANGELOG(trunk version remains 2.44.0; no downgrade).Verification (local)
Refs
AGENTS/release-marshal/outputs/pseudo-version-develop-ancestry-2026-04-22.md(control-plane; ancestry analysis).