equal
deleted
inserted
replaced
59 Rebase - generate a conflict: |
59 Rebase - generate a conflict: |
60 |
60 |
61 $ hg rebase -s 2 -d 1 |
61 $ hg rebase -s 2 -d 1 |
62 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
62 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
63 merging f |
63 merging f |
64 warning: conflicts during merge. |
64 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
65 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
66 unresolved conflicts (see hg resolve, then hg rebase --continue) |
65 unresolved conflicts (see hg resolve, then hg rebase --continue) |
67 [1] |
66 [1] |
68 |
67 |
69 Fix the 1st conflict: |
68 Fix the 1st conflict: |
70 |
69 |
73 (no more unresolved files) |
72 (no more unresolved files) |
74 $ hg rebase -c |
73 $ hg rebase -c |
75 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
74 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
76 rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) |
75 rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) |
77 merging f |
76 merging f |
78 warning: conflicts during merge. |
77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
79 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
80 unresolved conflicts (see hg resolve, then hg rebase --continue) |
78 unresolved conflicts (see hg resolve, then hg rebase --continue) |
81 [1] |
79 [1] |
82 |
80 |
83 Fix the 2nd conflict: |
81 Fix the 2nd conflict: |
84 |
82 |