Martin Grotzke wrote:
> 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).
>
It should not if you pick the right revision numbers to start from for
each merge. With SVN this can be frustrating.
> If you can show me on how to do the sync without such issues later on I
> would be very happy :)
>
When i get time i will do a merge and tell you what i did.
Paul.
--
| ? + ? = To question
----------------\
Paul Sandoz
x38109
+33-4-76188109