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

Confusing resolve conflicts wording

From: Justin Michel <michel_j_at_ociweb.com>
Date: 2006-06-08 17:56:03 CEST

If I right click on a conflict after doing a merge, I am given the
option to "resolve conflict using theirs". I expected that this would
choose "theirs" only for the parts of the file that actually conflict,
but what it actually does is copy "theirs" over "mine", including
changes within the file which were not conflicted.

A quick fix would be to rename the context menu option to something
like. "Copy theirs over mine", or "Choose theirs instead of mine", or
something like that.

A better fix would be to actually implement the feature where the merge
is performed, but "theirs" is only chosen for individual blocks that
actually conflict. This latter request is already in the issue tracker
#117. In this case the context menu should also be changed to be
perfectly clear.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jun 8 17:59:00 2006

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.