Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interactive rebasing last picture (1-8) #16

Open
Rodrirokr opened this issue Jan 4, 2020 · 1 comment
Open

Interactive rebasing last picture (1-8) #16

Rodrirokr opened this issue Jan 4, 2020 · 1 comment

Comments

@Rodrirokr
Copy link

After the last example of rebasing in this page there is an image showing the new rebased repository.

rebasing-branches-2

The first commit after Z, states that I'equals B+C+, I'm not sure but that would not be C+Xinstead?

@ghost
Copy link

ghost commented Jun 11, 2020

Let's step back for a second. We cherry-picked C and X. At some point, we want to merge L into Z. The Z branch contains the X commit, aka. we don't need to apply it a second time since it's already there as the base of I is a new child of Z. However, we need to apply B in order to get to C because it's the parent of C (or build-up, requirement, prerequisite, whatever you want to call it).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant