If you get a merge failure error because of an svn:special file revert --recursive www will remove the offending file.
In CEE, the trunk/www folder, you are not permitted to commit a symlink. If you get the following error:
Commit failed (details follow): svn: MERGE request failed on '/svn/build-automation/trunk/www/cn-project-pages/etcetera/etcetera svn: Commit blocked by pre-commit hook (exit code 1) with output: Cannot add or change 'svn:special' property on or under www/ directory:
svn propdel svn:special www/<symlink> svn revert --recursive www