[转] local add, incoming add upon merge 解决方法

FROM: http://blog.sina.com.cn/s/blog_67a5e4720100yg36.html

在svn命令行merge之后文件经常会出现local add, incoming add upon merge问题，导致无法提交，可以通过以下命令解决冲突
Summarizing to resolve the tree conflict committing your working dir with svn client 1.6.x you can use:
svn resolve --accept working -R .
where . is the directory in conflict.