[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: Felix Saphir <felix.saphir_at_kantarmedia.com>
Date: Sat, 15 Oct 2011 01:13:35 +0200

Am 14.10.2011 23:43, schrieb spongman:
> On Oct 14, 2:33 pm, Stefan K√ľng<tortoise..._at_gmail.com> wrote:
>
>> And the dialog already shows you the file that the conflict occurs on.
>> The url of the parts you want to merge, that's the url you entered in
>> the merge dialog.
>
> it shows some of those things, but it doesn't clarify which versions/
> paths 'local' and 'repository' refer to.

Standard question: What would the user gain? Keep in mind, that he or
she is currently merging their own changed files from a known
repository. They usually know their own changes, and the greatest worry
would probably be a correct merge. How would your proposed change ease
that situation?

Felix

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855358

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-15 01:13:51 CEST

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