You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Hans Lambermont <ha...@shapeways.com> on 2010/12/01 15:29:11 UTC

How to resolve 'directory replaced by symlink' conflicts that come in via a merge ?

Hi list,

How to resolve 'directory replaced by symlink' conflicts that come in via a merge ?
'svn st' says "local obstruction, incoming add upon merge" on such a directory.
Please note that these directories were not locally modified.

svn 1.6.12 used.

ps. please cc me as i'm not subscribed to this list.

regards,
   Hans Lambermont