diff options
| author | Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-28 21:27:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-29 15:54:11 (GMT) |
| commit | bc4caecf9557c765951897d8483b1514ebae74bf (patch) | |
| tree | ff832043b7ca4966267cbc0ded3ebddd727eae12 /Documentation/technical | |
| parent | bd7dfa543e0263858071b8648a55ef7ccae1085b (diff) | |
| download | git-bc4caecf9557c765951897d8483b1514ebae74bf.zip git-bc4caecf9557c765951897d8483b1514ebae74bf.tar.gz git-bc4caecf9557c765951897d8483b1514ebae74bf.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/rerere.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index e65ba9b..aa22d7a 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. |