你的位置:首页 > 操作系统

[操作系统]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    kkkCommitted revision 24.[root@v01 webtest]# lsdefault1.html default.html index.html index.php