described in the "TRUE MERGE" section of
<a href="git-merge.html">git-merge(1)</a>.  The working tree files will include
a description of the conflict bracketed by the usual
conflict markers <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> and <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code>.</p>
</li>
<li>
<p>No other modifications are made.</p>
</li>
</ol>
</div>
<div class="paragraph">
<p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
conflicts.</p>
</div>
</div>
</div>
<div class="sect