Re: Resolve property conflicts dialog

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.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2669726
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].