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

Butt Dyno wrote:
> TortoiseSVN 1.1.6
> Windows XP
>
> We had a situation where the svn:externals property was in conflict,
> and as such the two directories (not their contents) were in conflict.
>
> Tortoise did not give us the option to resolve the directory, even
> though it showed up as conflicted. We had to go in with the command
> line to run "svn resolved" by hand.

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.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org