local add, incoming add upon merge

来源:互联网 发布:cf检测到数据异常 编辑:程序博客网 时间:2024/05/16 05:31

在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.