Last active
August 12, 2016 14:39
-
-
Save electrofelix/3c9aa6e0113128dbc93a1187307bd3da to your computer and use it in GitHub Desktop.
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
Given: | |
J | |
/ \ | |
B--------I---E---K master | |
/ / | |
/ B1 <--- last import replayed B | |
/ / | |
A---C---D---F---G---H upstream/master | |
Note 'I' is the previous import merge commit. | |
Attempting to linearise tries to create an initial import branch looking like import/next: | |
J | |
/ \ | |
B--------I---E---K master | |
/ / | |
/ B1 | |
/ / | |
A---C---D---F---G---H upstream/master | |
\ | |
B1---E---J import/next |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment