ne using <code>fcm merge</code>.</p>

  <ul>
    <li>The chance of conflicts will be reduced if the branches you are
    combining have been created from the same point on the trunk. Your package
    branch should also be created from the same point on the trunk.

      <ul>
        <li><em>Currently, <code>fcm merge</code> will not work unless this is
        true.</em></li>
      </ul>
    </li>

    <li>If further changes are made on a branch you are using in a package then
    you can incorporate these 