Document git-rebase behavior on conflicts.
This commit is contained in:

committed by
Junio C Hamano

parent
fb18a2edf7
commit
8978d043c3
@ -48,6 +48,18 @@ would be:
|
|||||||
/
|
/
|
||||||
D---E---F---G master
|
D---E---F---G master
|
||||||
|
|
||||||
|
In case of conflict, git-rebase will stop at the first problematic commit
|
||||||
|
and leave conflict markers in the tree. After resolving the conflict manually
|
||||||
|
and updating the index with the desired resolution, you can continue the
|
||||||
|
rebasing process with
|
||||||
|
|
||||||
|
git am --resolved --3way
|
||||||
|
|
||||||
|
Alternatively, you can undo the git-rebase with
|
||||||
|
|
||||||
|
git reset --hard ORIG_HEAD
|
||||||
|
rm -r .dotest
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
<newbase>::
|
<newbase>::
|
||||||
|
Reference in New Issue
Block a user