svn 提交冲突（目录下删除文件）

[root@v01 webtest]# svn ci -m "delete kkk"
svn: Commit failed (details follow):
svn: Aborting commit: '/alidata/www/webtest/kkk' remains in conflict

 

[root@v01 webtest]# svn remove --force kkk/
D         kkk
[root@v01 webtest]# svn resolve --accept=working kkk/
Resolved conflicted state of 'kkk'
[root@v01 webtest]# svn ci -m ""
Deleting       kkk

Committed revision 24.
[root@v01 webtest]# ls
default1.html  default.html  index.html  index.php