mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/rerere-doc-updates'

Browse Source 
Clarify a part of technical documentation for rerere.

* tg/rerere-doc-updates:
  rerere: add note about files with existing conflict markers
  rerere: mention caveat about unmatched conflict markers
This commit is contained in:
Junio C Hamano
2018-09-17 13:53:56 -07:00
parent 881c019ea6 f427869bde
commit d88949d86e
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-rerere.txt
View File

@ -211,6 +211,12 @@ would conflict the same way as the test merge you resolved earlier.
'git rerere' will be run by 'git rebase' to help you resolve this 'git rerere' will be run by 'git rebase' to help you resolve this
conflict. conflict.
[NOTE] 'git rerere' relies on the conflict markers in the file to
detect the conflict. If the file already contains lines that look the
same as lines with conflict markers, 'git rerere' may fail to record a
conflict resolution. To work around this, the `conflict-marker-size`
setting in linkgit:gitattributes[5] can be used.
GIT GIT
--- ---
Part of the linkgit:git[1] suite Part of the linkgit:git[1] suite

4
Documentation/technical/rerere.txt
View File

@ -149,6 +149,10 @@ version, and the sorting the conflict hunks, both for the outer and the
inner conflict. This is done recursively, so any number of nested inner conflict. This is done recursively, so any number of nested
conflicts can be handled. conflicts can be handled.
Note that this only works for conflict markers that "cleanly nest". If
there are any unmatched conflict markers, rerere will fail to handle
the conflict and record a conflict resolution.
The only difference is in how the conflict ID is calculated. For the The only difference is in how the conflict ID is calculated. For the
inner conflict, the conflict markers themselves are not stripped out inner conflict, the conflict markers themselves are not stripped out
before calculating the sha1. before calculating the sha1.