[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Merge makes conflicts when done via GUI

From: Wilhelm Molterer <mneureiter_at_juvavis.com>
Date: Sat, 23 Jul 2011 04:17:28 -0700 (PDT)

> > 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.


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

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.