Repository navigation
forge: Add linear merge range capability - #1398
Merged
Merged
Conversation
Owner
Author
|
This change is part of the following stack:
Change managed by git-spice. |
This was referenced Aug 10, 2026
abhinav
force-pushed
the
github-merge-range
branch
from
August 12, 2026 02:43
32236d4 to
5bce822
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
August 12, 2026 03:06
5bce822 to
adc76e0
Compare
abhinav
marked this pull request as ready for review
August 12, 2026 04:19
abhinav
force-pushed
the
github-merge-range
branch
from
August 12, 2026 04:19
adc76e0 to
ac1c88a
Compare
abhinav
marked this pull request as draft
August 15, 2026 13:56
abhinav
force-pushed
the
github-merge-range
branch
from
August 15, 2026 13:56
ac1c88a to
d863566
Compare
This was referenced Aug 15, 2026
abhinav
force-pushed
the
github-merge-range
branch
from
August 23, 2026 13:40
d863566 to
b651611
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
August 24, 2026 03:02
b651611 to
946584e
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
August 24, 2026 04:08
946584e to
8951076
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
August 24, 2026 12:41
8951076 to
ea05213
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
October 13, 2026 13:42
ea05213 to
b279ef1
Compare
abhinav
force-pushed
the
github-merge-range
branch
from
October 18, 2026 04:24
b279ef1 to
c3be1ae
Compare
A selected branch forest does not identify the native range a provider can merge. Stack reconciliation may preserve an existing path that differs from a local longest-path choice, so atomic merge planning must use the provider result. Extend `WithStacks` with `PlanMergeRanges`. Each executable plan binds a bottom-to-top change range to one atomic merge operation, while changes omitted from every plan remain available for ordinary merging. `ErrUnsupported` preserves per-change fallback before any atomic operation starts. Carry both semantic change relationships and provider-facing base branches in the desired stack state. GitHub uses one batched read to plan lowest selected native-stack prefixes and singleton unstacked pull requests. Before starting the asynchronous merge, each plan reloads its range and verifies the prepared bases, heads, and commits. Shared forge and GitHub divergent-stack scenarios exercise the planning and execution boundary. Refs #1388
abhinav
force-pushed
the
github-merge-range
branch
from
October 19, 2026 01:29
c3be1ae to
ad41e77
Compare
abhinav
marked this pull request as ready for review
October 19, 2026 01:31
This was referenced Oct 24, 2026
Merged
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.
Forge repositories need an optional operation that can atomically merge
a fully restacked linear change range while rejecting stale remote
state. Add
WithMergeRangewith the expected branch names and headcommits needed for providers to enforce that boundary.
GitHub keeps its full pull request projection local to range validation,
checks branches, commits, and native-stack membership, then delegates to
the asynchronous merge gateway. The shared integration scenario creates
the required native stack before starting the range merge and waits for
operation acceptance and final merged states.
The GitHub integration cassette remains deliberately unrecorded for a
human operator to capture.
Refs #1388