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

Re: Confusing resolve conflicts wording

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-06-08 18:15:45 CEST

Justin Michel wrote:
> 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.

Sure. It says "resolve conflict _using theirs_".

> 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.

But then, the user won't know that this is to actually *resolve* the

> 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.

Issue #117 is called "Resolve multiple conflicts at once". The text in
it clearly indicates that this request is to select multiple conflicted
*files* and resolve them all at once.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jun 8 18:16:42 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.