git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-12 04:41:35 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

rerere: add note about files with existing conflict markers

Browse Source 
When a file contains lines that look like conflict markers, 'git
rerere' may fail not be able to record a conflict resolution.
Emphasize that in the man page, and mention a possible workaround for
the issue.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer 2018-08-28 22:27:44 +01:00 committed by Junio C Hamano
parent bc4caecf95
commit f427869bde
1 changed files with 6 additions and 0 deletions
Show Stats 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