rerere: add note about files with existing conflict markers
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>
Thomas Gummerer committed
Aug 28, 2018 at 22:27 UTC
f427869bde759e32c30e8ba7a4b20837d3806642
1 file changed
+6
Documentation/git-rerere.txt
+6
@@ -211,6 +211,12 @@ would conflict the same way as the test merge you resolved earlier.
211
'git rerere' will be run by 'git rebase' to help you resolve this
212
conflict.
213
214
+[NOTE] 'git rerere' relies on the conflict markers in the file to
215
+detect the conflict. If the file already contains lines that look the
216
+same as lines with conflict markers, 'git rerere' may fail to record a
217
+conflict resolution. To work around this, the `conflict-marker-size`
218
+setting in linkgit:gitattributes[5] can be used.
219
+
220
GIT
221
---
222
Part of the linkgit:git[1] suite