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

Re: TortoiseShell: should be "Resolve" instead of "Resolved"

From: Lorenz <lorenznl_at_yahoo.com>
Date: Mon, 03 Jun 2013 06:08:50 +0000

ch3cooli wrote:

>See patch

I don't think so.

This command does not resolve the confict(s), that's your job.

It only tells (T)SVN to remove the additional files (and the internal
flag, if there even is one) associated with the conflicting original
file. 

-- 
Lorenz
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3056965
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-03 17:30:06 CEST

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

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