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

Re: missing conflict dialog?!?

From: Andy Levy <andy.levy_at_gmail.com>
Date: Wed, 23 Jul 2008 08:02:49 -0400

On Wed, Jul 23, 2008 at 04:37, Dominik Ruf <dominikruf_at_googlemail.com> wrote:
> Hi,
> I wondered why TortoiseSVN doesn't open a conflict dialog when a
> update leads to a conflict. I think it would be very helpful if a
> dialog would pop up (similar to when you are merging 2 branches) where
> the user can directly resolve the conflict.

How do you propose that this dialog allow the user to "directly
resolve the conflict" when it's a binary file (DOC, XLS, JPG, PDF)?

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-23 14:03:07 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.