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

Re: TortoiseMerge Resolve & Save

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 28 Jun 2013 18:49:23 +0200

On 28.06.2013 18:26, Oto BREZINA wrote:

>> Thinking about this a little more, I think it's not a good idea to
>> change the text: it would have to be "Save & mark as resolved" since
>> "Save & Resolve" would indicate that it does resolve the conflict
>> automatically, but all it can do is to mark the conflict state of the
>> file as resolved.
>> But how about removing the "Resolve" button completely? It's not
>> really necessary since when saving, the save dialog asks whether to
>> mark the file as resolved anyway (if the file is actually marked as
>> conflicted, so it won't even ask if the file is not versioned and/or
>> not marked as conflicted).

> Actually I would vote against removing, this button saves a click.

How does it save a click?
If it's not there anymore, you can't click on it so it saves a click if
it's removed.

> And sometimes I want to only past and save, resolve rest later, i would
> have to think about it - I'm in little rush right now.

That's why the dialog on exit/save asks you whether you want to mark the
file as resolved or not. Just click "no" if you want to resolve later.

> You can call it "save &mark...", but I would like to see it.

"mark" isn't enough. Mark what? Mark as what?

> Let me remind that when saving file marked as need resolve Having only
> one dialog instead of two (Save?, Mark?) is preffered from my side.

That's what it does now:

if you save the file and there are no more conflicts, it asks whether to
mark the file as resolved.

If you exit without saving, it asks whether to save, and if you save it
then asks whether to mark the file as resolved.


   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 2013-06-28 18:49:30 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.