RE: resolve conflict dialog is confusing

> On Oct 14, 2:33 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> > On 14.10.2011 23:21, spongman wrote:
> > Well, you mentioned that in a month old post.
>
> what? i wrote it 109 minutes ago, here:
>
> https://groups.google.com/group/tortoisesvn/msg/a2ceec597c0fabff
>
> > 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.
>
> > I don't think that would really improve the dialog.

My 3 way merge tool shows the path to the local copy, the repository copy and the merged result.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-17 21:52:15 CEST