graphy remote branch integration#13881
Draft
estib-vega wants to merge 3 commits into
Draft
Conversation
This was referenced May 19, 2026
estib-vega
force-pushed
the
merge-arithmetic-squash
branch
from
f7f376b to
cb68058
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
f4a8cd2 to
d526389
Compare
estib-vega
force-pushed
the
merge-arithmetic-squash
branch
from
cb68058 to
bd552d4
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
2 times, most recently
from
4a2aeee to
814fbf8
Compare
estib-vega
force-pushed
the
merge-arithmetic-squash
branch
from
bd552d4 to
5cc953b
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
814fbf8 to
928d02f
Compare
estib-vega
force-pushed
the
merge-arithmetic-squash
branch
from
5cc953b to
386657d
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
928d02f to
460d1df
Compare
estib-vega
force-pushed
the
merge-arithmetic-squash
branch
from
386657d to
75fda44
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
460d1df to
6780aac
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
6780aac to
4971b3d
Compare
Get the initial steps, based on the commits in the local branch and on the upstream. branch upstream: integrate using the given steps Given a set of steps, integrate the upstream changes to the local branch. branch upstream integration: merge commit Add the ability to integrate changes by merge commit WIP wip: Merge by creating a full new commit merge correctly integration: Intial steps and display information
We can reuse the logic behind caculating the disconnect params.
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
4971b3d to
86c70e1
Compare
estib-vega
force-pushed
the
branch-upstream-integration
branch
from
86c70e1 to
68e88f2
Compare
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
1 participant
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.
Implement the APIs for remote branch integration backed by the new rebase engine an repo graph.
This is part 3 of 3 in a stack made with GitButler: