On Wed, Sep 24, 2008 at 12:48 PM, Jan Lehnardt <[EMAIL PROTECTED]> wrote:

>
> If there are new conflicts introduced by conflict resolutions,
> you start over with V2a and V2b being the first resolution and
> the newly conflicting change.
>

 Okay, now that makes sense.

Reply via email to