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

Re: resolve conflict dialog is confusing

From: spongman <piersh_at_gmail.com>
Date: Wed, 19 Oct 2011 10:14:31 -0700 (PDT)

On Oct 18, 3:54 pm, Simon Large <simon.tortoise..._at_gmail.com> wrote:
> I would always use Edit Conflicts and
> recommend others to do the same.

not an option if you're merging trees containing binary files. in that
case those buttons are your only option.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-19 19:19:48 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.