Re: [TSVN] TortoiseSVN does not let you resolve conflicted directories

http://svn.haxx.se/tsvn/archive-2005-06/0523.shtml

> In case this ever happens again: just delete the two (or three?) extra
> files Subversion creates in case of a conflict. That will mark the
> folder as resolved too, no need to install the CL client.

Maybe I'm misunderstanding you, but I think that only works for files.
We didn't see any additional files (*.left, *.right?) created for this
particular conflict.

Am I correct that the client doesn't currently have logic in place to
handle the case where the directory itself is in conflict?

Thanks,
John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jun 15 20:12:48 2005