tion, then merge to the trunk and
    deal with any conflicts</dt>

    <dd>
      <p>This may be the best method if:</p>

      <ul>
        <li>Your changes have already been tested against a stable baseline and
        re-testing after merging would be impracticable.</li>

        <li>Your branch needs to be available for others to merge in its
        changes in isolation.</li>
      </ul>
    </dd>

    <dt>Merge in the latest code from the trunk before your final test and
    review</dt>

    <dd>
   