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

Re: Conflicts

From: Eric Lemes <ericlemes_at_gmail.com>
Date: Mon, 6 Oct 2008 09:45:06 -0200

On Mon, Oct 6, 2008 at 9:10 AM, Dave Lawrence

> > But I think resolved now brings up an intermediate dialog, you can right
> > click on the file in there and get resolved using mine.
> sorry, you already said that!
> Yes, I did.

I don't think it's wrong, only that it helps the user to do a mistake. In my
opinion, resolve the conflict keeping the conflict markers isn't an option,
and the "resolve using mine" and "resolve using theirs" should be more

Thanks for your help,

Received on 2008-10-06 13:45:14 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.