Skip to content

merge: Preserve native stacks behind trunk - #1492

Merged
abhinav merged 1 commit into
mainfrom
native-merge-trunk-fix
Oct 26, 2026
Merged

abhinav merged 1 commit into
mainfrom
native-merge-trunk-fix

Conversation

@abhinav

@abhinav abhinav commented Oct 26, 2026

Copy link
Copy Markdown
Owner

An internally aligned native stack can merge after trunk advances.
Preparing its trunk-based bottom instead rebases that branch and
forces every member above it to restack and resubmit before merging.

Keep the preflight head for a member originally based on trunk,
matching individual merge preparation.
Continue preparing other members, including range bottoms whose bases
were merged by earlier queue items.

Allow the same case in ShamHub by separating the current target head
from the bottom change's merge base.
Apply the stack's delta from that merge base onto the current target
so merge and squash operations preserve independent trunk changes.
Keep the target head as the publication parent and CAS expectation.

[skip changelog]: Fixes unreleased native stack merging.

An internally aligned native stack can merge after trunk advances.
Preparing its trunk-based bottom instead rebases that branch and
forces every member above it to restack and resubmit before merging.

Keep the preflight head for a member originally based on trunk,
matching individual merge preparation.
Continue preparing other members, including range bottoms whose bases
were merged by earlier queue items.

Allow the same case in ShamHub by separating the current target head
from the bottom change's merge base.
Apply the stack's delta from that merge base onto the current target
so merge and squash operations preserve independent trunk changes.
Keep the target head as the publication parent and CAS expectation.
@abhinav abhinav added the skip changelog PRs that don't need a changelog. label Oct 26, 2026
@abhinav
abhinav enabled auto-merge (squash) October 26, 2026 01:44
@abhinav
abhinav merged commit d56c4b3 into main Oct 26, 2026
23 checks passed
@abhinav
abhinav deleted the native-merge-trunk-fix branch October 26, 2026 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip changelog PRs that don't need a changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant