From: Thomas Gummerer Date: Tue, 28 Aug 2018 21:27:43 +0000 (+0100) Subject: rerere: mention caveat about unmatched conflict markers X-Git-Tag: v2.20.0-rc0~238^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bc4caecf9557c765951897d8483b1514ebae74bf rerere: mention caveat about unmatched conflict markers 4af3220 ("rerere: teach rerere to handle nested conflicts", 2018-08-05) introduced slightly better behaviour if the user commits conflict markers and then gets another conflict in 'git rerere'. However this is just a heuristic to punt on such conflicts better, and doesn't deal with any unmatched conflict markers. Make that clearer in the documentation. Suggested-by: Junio C Hamano Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano --- diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index e65ba9b0c6..aa22d7ace8 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -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 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 inner conflict, the conflict markers themselves are not stripped out before calculating the sha1.