  </ol>

  <h2 id="branching">Branching &amp; Merging</h2>

  <h3 id="branching_when">When to Branch</h3>

  <p>If you are making a reasonably large change which will take more than a
  hour or two to prepare then there are clear advantages to doing this work on
  a branch.</p>

  <ul>
    <li>You can commit intermediate versions to the branch.</li>

    <li>If you need to merge in changes from the trunk then you have a record
    of your files prior to the merge.</li>

    <li>The version of the code which