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

Aw: Merge Wizard - Feature Request

From: <tmto_at_arcor.de>
Date: 2007-11-07 21:53:51 CET


i have a feature request for the new merge wizard.

If there is a conflict on the merge the dialog "Resolve conflict" appears. For the option "Choose item:" there are two buttons "Use local" and "Use repository". That`s quite fine. But when I have to merge branches I don`t know which is the right version without have a look into the files. So I would like to have another button "Diff" to see the differences between the files and then to decide if I can take one of the two files or if I have to edit and merge the files.

Ok it`s possible to click the button "Edit conflict" but the Diff tool then starts already in the merge mode and not in the diff mode.

Just my opinion and a suggestion.


Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT FÜR ALLE NEUEINSTEIGER
Jetzt bei Arcor: günstig und schnell mit DSL - das All-Inclusive-Paket
für clevere Doppel-Sparer, nur 29,95 € inkl. DSL- und ISDN-Grundgebühr!

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 7 21:53:58 2007

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.