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

Re: resolve conflict dialog is confusing

From: Dave Huang <khym_at_azeotrope.org>
Date: Thu, 19 Aug 2010 14:08:00 -0500

On 8/19/2010 1:59 PM, spongman wrote:
> the term 'repository' is ambiguous since both branches are in the
> repository, and this button does not disambiguate between them.
> the term 'local' sin't much better - does it refer to my working copy
> before the merge, the working copy after the failed merge, some other
> local copy?
Merges aren't done on branches in the repository though--they're done
between a working copy and the repository. When you do a merge, you
generally only specify a single repository URL (the exception being the
"merge two different trees" option, but in that case, both repo URLs
define the "source" of the merge; you're still merging into your working

In any case, I don't think the documentation for the conflict resolution
process needs to be on the window; the terms are clear enough if you
read the TSVN help file.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-19 21:09:35 CEST

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.