在 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.
没有评论:
发表评论