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.html | |
| parent | a68ff6db4d42f41cb49143a5423fbe50f539043e (diff) | |
| download | git-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz | |
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rerere.html b/git-rerere.html index 1c3c33d6a..120549d59 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -972,6 +972,11 @@ This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier.
<em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this
conflict.</p></div>
+<div class="paragraph"><p>[NOTE] <em>git rerere</em> 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, <em>git rerere</em> may fail to record a
+conflict resolution. To work around this, the <code>conflict-marker-size</code>
+setting in <a href="gitattributes.html">gitattributes(5)</a> can be used.</p></div>
</div>
</div>
<div class="sect1">
@@ -985,7 +990,7 @@ conflict.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-09-17 15:45:24 PDT
</div>
</div>
</body>
|