diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:57 -0700 |
| commit | d88949d86eddb62acbc85c16c97587db043d05b1 (patch) | |
| tree | da1257a2fbea26867cd6226c308cfd9004db81bb /Documentation | |
| parent | Merge branch 'es/format-patch-rangediff' (diff) | |
| parent | rerere: add note about files with existing conflict markers (diff) | |
| download | tgif-d88949d86eddb62acbc85c16c97587db043d05b1.tar.xz | |
Merge branch 'tg/rerere-doc-updates'
Clarify a part of technical documentation for rerere.
* tg/rerere-doc-updates:
rerere: add note about files with existing conflict markers
rerere: mention caveat about unmatched conflict markers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rerere.txt | 6 | ||||
| -rw-r--r-- | Documentation/technical/rerere.txt | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 031f31fa47..df310d2a58 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -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 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 --- Part of the linkgit:git[1] suite 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. |