當工作目錄修改刪除過時更新使用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])