RE: Best Practices enquiry

[Paul Sander]

>--- Forwarded mail from address@hidden

>>    1- Merge the branch to the trunk each time a bug fix is done on
>>       the branch, resolving (an increasing number of) conflicts
>>       as they appear (no real need for merge tags in this case); or
>Merge-as-you-go is the best approach. It minimizes conflicts. Remember, when
>you merge, you don't merge from the base of the branch to the tip, only from
>the previous revision to the one you just checked in.

More specifically, from the latest version that existed before the bug
fix effort commenced.  Remember, there may be multiple commits, even to
the same file, during the course of the change.

>--- End of forwarded message from address@hidden