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

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

From: Hans Lambermont <hans_at_shapeways.com>
Date: Wed, 1 Dec 2010 16:29:11 +0100

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
Received on 2010-12-01 16:39:06 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.