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

Question about TortoiseMerge on modified files

From: David Balažic <david.balazic_at_hermes-softlab.com>
Date: Fri, 13 Mar 2009 15:55:55 +0100


If the Check for Modifications windows shows for a file,
that it is modified both localy and remote, then double clicking it
brings up the TortoiseMerge windows.

In that window, you can gor from conflict to conflict (F8, shift-F8)
and then "use their" or "use mine" (ctrl-F9 and ctrl-F10).
(the bottom view changes content accordingly.

But what is the purpose of all this ?
You can not save any choices made.

To properly resolve conflicts, one must "Update" the file, and then
do the above again. Except that now you can save the work.

In short: why are the conflict resolution functions active, when
the result is not used/saved ?

This is on v1.5.9 win32


http://www.nosoftwarepatents.com Innovation, not litigation !

David Balažic                 mailto:david.balazic_at_hermes-softlab.com
HERMES Softlab                http://www.hermes-softlab.com
Zagrebska cesta 104           Phone: +386 2 450 8937 
SI-2000 Maribor
"Be excellent to each other." -
Bill S. Preston, Esq. & "Ted" Theodore Logan
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-13 15:58:21 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.