mirror of
https://github.com/git/git.git
synced 2024-09-28 04:10:41 +02:00
Document git-rebase behavior on conflicts.
This commit is contained in:
parent
fb18a2edf7
commit
8978d043c3
@ -48,6 +48,18 @@ would be:
|
||||
/
|
||||
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
|
||||
-------
|
||||
<newbase>::
|
||||
|
Loading…
Reference in New Issue
Block a user