[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: Oto BREZINA <brezina_at_printflow.eu>
Date: Fri, 28 Jun 2013 20:59:06 +0200

On 2013-06-28 18:49, Stefan Küng wrote:
> 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.
Methode A: my preffered
     1. Click "Mark As Resolved" - I have it in installed version few
weeks old
     2. Close window
= 2+1 click

Methode B:
     1. Click Save
     2. Click / select mark resolved when asked
     3. Close window
= 3+2 clicks

Note Ribbon are usualy hidden so its 1 for A and 2 for B more clicks

Methode C:
    1. Close window
    2. click save
    3 click / select mark resolved when asked
= 3 click

Methode D: - not implemented
    1. Close window
    2. click Save and Mark Resolved
= 2 clicks

Or did I miss something?

> "mark" isn't enough. Mark what? Mark as what?
just result of rush :) "Save & mask resolved"
>> 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.
Thats the point - it ask twice .... see above.
> Stefan

BTW: seems tigris stopped to add reply to to emails, using replay tried
to send email you dirrectly instead of dev@


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-28 20:59:13 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.