al with little danger of any side-effects.</li>

            <li>Where the clashes are significant then, in most cases, this
            will be very obvious whilst you are resolving the conflicts. In
            this case you should repeat the testing and get the updates
            reviewed.</li>
          </ul>This is the recommended approach since it doesn't inhibit
          parallel development and yet the chances of a bad change being
          committed to the trunk are still very small.
        </l