mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
70 lines
797 B
Plaintext
70 lines
797 B
Plaintext
|
|
% - Rebasing B onto E - check keep
|
|
@ 5:F:notdefault
|
|
|
|
|
| o 4:E:
|
|
| |
|
|
| o 3:D:
|
|
|/
|
|
| o 2:C:
|
|
| |
|
|
| o 1:B:
|
|
|/
|
|
o 0:A:
|
|
|
|
warning: conflicts during merge.
|
|
merging A failed!
|
|
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
|
|
merging A
|
|
|
|
% - Solve the conflict and go on
|
|
@ 7:C:
|
|
|
|
|
o 6:B:
|
|
|
|
|
| o 5:F:notdefault
|
|
| |
|
|
o | 4:E:
|
|
| |
|
|
o | 3:D:
|
|
|/
|
|
| o 2:C:
|
|
| |
|
|
| o 1:B:
|
|
|/
|
|
o 0:A:
|
|
|
|
|
|
% - Rebase F onto E - check keepbranches
|
|
@ 5:F:notdefault
|
|
|
|
|
| o 4:E:
|
|
| |
|
|
| o 3:D:
|
|
|/
|
|
| o 2:C:
|
|
| |
|
|
| o 1:B:
|
|
|/
|
|
o 0:A:
|
|
|
|
warning: conflicts during merge.
|
|
merging A failed!
|
|
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
|
|
merging A
|
|
|
|
% - Solve the conflict and go on
|
|
saved backup bundle to
|
|
@ 5:F:notdefault
|
|
|
|
|
o 4:E:
|
|
|
|
|
o 3:D:
|
|
|
|
|
| o 2:C:
|
|
| |
|
|
| o 1:B:
|
|
|/
|
|
o 0:A:
|
|
|