diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
| commit | 980e61ec567f55c9247391052477e61a32d24548 (patch) | |
| tree | 6fe236d0a6fd3ffa6a1be9a52219ed50b7dfcd19 /git-rerere.txt | |
| parent | a68ff6db4d42f41cb49143a5423fbe50f539043e (diff) | |
| download | git-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz | |
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 031f31fa4..df310d2a5 100644 --- a/git-rerere.txt +++ b/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 |