equal
deleted
inserted
replaced
66 |
66 |
67 $ hg rebase -s 1 -d 4 --keep |
67 $ hg rebase -s 1 -d 4 --keep |
68 rebasing 1:27547f69f254 "B" |
68 rebasing 1:27547f69f254 "B" |
69 rebasing 2:965c486023db "C" |
69 rebasing 2:965c486023db "C" |
70 merging A |
70 merging A |
71 warning: conflicts during merge. |
71 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
72 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
73 unresolved conflicts (see hg resolve, then hg rebase --continue) |
72 unresolved conflicts (see hg resolve, then hg rebase --continue) |
74 [1] |
73 [1] |
75 |
74 |
76 Solve the conflict and go on: |
75 Solve the conflict and go on: |
77 |
76 |
123 o 0:draft 'A' |
122 o 0:draft 'A' |
124 |
123 |
125 $ hg rebase -s 5 -d 4 --keepbranches |
124 $ hg rebase -s 5 -d 4 --keepbranches |
126 rebasing 5:01e6ebbd8272 "F" (tip) |
125 rebasing 5:01e6ebbd8272 "F" (tip) |
127 merging A |
126 merging A |
128 warning: conflicts during merge. |
127 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
129 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
130 unresolved conflicts (see hg resolve, then hg rebase --continue) |
128 unresolved conflicts (see hg resolve, then hg rebase --continue) |
131 [1] |
129 [1] |
132 |
130 |
133 Solve the conflict and go on: |
131 Solve the conflict and go on: |
134 |
132 |