h">branch</a>. Whenever you
create a Git <a href="#def_repository">repository</a>, a branch named
"master" is created, and becomes the active branch. In most
cases, this contains the local development, though that is
purely by convention and is not required.</p>
</dd>
<dt class="hdlist1"><a id="def_merge"></a>merge</dt>
<dd>
<p>As a verb: To bring the contents of another
<a href="#def_branch">branch</a> (possibly from an external
<a href="#def_repository">repository</a>) into the current branch.  In the
cas