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 <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
bc4caecf9557c765951897d8483b1514ebae74bf
1 file changed
+4
Documentation/technical/rerere.txt
+4
@@ -149,6 +149,10 @@ version, and the sorting the conflict hunks, both for the outer and the
149
inner conflict. This is done recursively, so any number of nested
150
conflicts can be handled.
151
152
+Note that this only works for conflict markers that "cleanly nest". If
153
+there are any unmatched conflict markers, rerere will fail to handle
154
+the conflict and record a conflict resolution.
155
+
156
The only difference is in how the conflict ID is calculated. For the
157
inner conflict, the conflict markers themselves are not stripped out
158
before calculating the sha1.