[[email protected] webtest]# svn ci -m "delete kkk" svn: Commit failed (details follow): svn: Aborting commit: ‘/alidata/www/webtest/kkk‘ remains in conflict
[[email protected] webtest]# svn remove --force kkk/ D kkk [[email protected] webtest]# svn resolve --accept=working kkk/ Resolved conflicted state of ‘kkk‘ [[email protected] webtest]# svn ci -m "" Deleting kkk Committed revision 24. [[email protected] webtest]# ls default1.html default.html index.html index.php
时间: 2024-10-19 13:08:10