subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Hans Lambermont <h...@shapeways.com>
Subject How to resolve 'directory replaced by symlink' conflicts that come in via a merge ?
Date Wed, 01 Dec 2010 15:29:11 GMT
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

Mime
View raw message