
merge.</p>
<div class="paragraph">
<p>As a noun: unless it is a <a href="#def_fast_forward">fast-forward</a>, a
successful merge results in the creation of a new <a href="#def_commit">commit</a>
representing the result of the merge, and having as
<a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>.
This commit is referred to as a "merge commit", or sometimes just a
"merge".</p>
</div>
</dd>
<dt class="hdlist1"><a id="def_object"></a>object</dt>
<dd>
<p>The unit of st