Hi Paul,
On Fri, 2008-04-11 at 10:34 +0200, Paul Sandoz wrote:
>
> On Apr 11, 2008, at 10:26 AM, Martin Grotzke wrote:
> >
> > Do you think there might be conflicts between your changes and the
> > things we're doing in the branch?
>
> There should not be. If you can i recommend regularly syncing the
> branch with changes from the trunk.
Hmm, I could merge in changes from the trunk, but AFAIK this would
create conflicts when merging the branch back to the trunk (from
revision of stop-on-copy to the latest one).
If you can show me on how to do the sync without such issues later on I
would be very happy :)
Cheers,
Martin
>
>
> Paul.