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

Re: Resolve property conflicts dialog

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 10 Oct 2010 11:08:07 +0200

On 09.10.2010 23:36, Simon Large wrote:
> Hi Stefan,
> The dialog used to resolve properties as 2 options:
> * Resolve using local property
> * Edit property manually
> Should there also be buttons to
> * Resolve using remote property

That's what the "edit manually" should be used for. Resolving a conflict
without even knowing what the remote properties are is dangerous. So
users should use the "edit manually" button instead and then use the
remote property from there if they want.

> * Mark this property conflict as resolved?

The "resolve using local property" already does that.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-10 11:08:17 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.