当工作目录修改删除过时更新使用svn更新就容易发生树冲突“Tree Confilict”.会出现类似提示。
local unversioned, incoming add upon update
| 1 | local unversioned,incoming add upon update |
如果使用图形化客户端可以通过对比文件和解决冲突按钮进行解决，
如果是使用命令行的，
情况类似如下：（其中 removed_directory 是你工作的某个目录）
$svn status D C removed_directory > local unversioned, incoming add upon update Summary of conflicts: Tree conflicts: 1
| 1 2 3 4 5 | $svnstatus D Cremoved_directory > local unversioned,incoming add upon update Summary of conflicts: Tree conflicts:1 |
这种情况我们可以通过以下命令解决：
$ svn resolve --accept working removed_directory Resolved conflicted state of 'removed_directory' $ svn revert removed_directory Reverted 'removed_directory' $ svn status $
| 1 2 3 4 5 6 | $svn resolve--accept working removed_directory Resolved conflicted state of'removed_directory' $svn revert removed_directory Reverted'removed_directory' $svn status $ |
)
)
)
)
![SSH出错--hibernate--org.hibernate.hql.ast.QuerySyntaxException: User is not mapped [from User]](http://pic.xiahunao.cn/SSH出错--hibernate--org.hibernate.hql.ast.QuerySyntaxException: User is not mapped [from User])