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

[TSVN] Re: feature request, sort of

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-11-19 22:27:37 CET

Matthew Danish <mrd+nospam <at> cmu.edu> writes:

> The menu option for "Resolved Conflicts" is very close to the menu
> option for "Edit Conflicts". As I was describing these to my
> co-worker, he accidentally clicked "Resolved" instead of "Edit".
> Clearly, there is a problem here, since it did not ask for
> confirmation nor does there seem to be a way to get back to the
> previous state where one could easily edit conflicts.

This is a very good point. I have almost been caught out by that before
because "Edit conflicts" and "Resolve conflicts" sound similar and get mixed
up in my head sometimes. A confirmation dialog on resolve would be a very good

> The other request is for 3-way TMerge to permit the menu option "Use
> this text block" even on areas that aren't conflicted; just like the
> ordinary 2-way view allows.

That's a good idea too. How easy is it to implement?


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 19 22:28:17 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.