RE: Re: Merge makes conflicts when done via GUI

> > svn merge [URL, from where the changes should be taken from]
>
> That's the short form of
> svn merge -r1:HEAD url .
>
> which should be the same as if you leave the revision range box in the
> merge dialog empty.
>
> Can you try leaving the box empty and see if that helps?

Well, that's what I actually do each time. I've never used the "Revision range" box when merging from trunk to branch.
This can't be the solution, I think.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2801525

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-23 13:17:31 CEST