0
我收到以下错误颠覆:分支合并后提交Trunk时出错。如何解决?
Subversion does not allow to commit this combination of files and directories at once.
Directory deletes must be recursive and this would commit other files:
Deleted directory:
D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_print\Images\Risk
Directory to commit:
D:\mm32.net\Trunk
Not to commit:
D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_offline\Images\Risk\Very-High-Risk.jpg
我有一个分支,我删除的东西加载该是多余的。然后我把树干合并到那个分支中。一切都很好,所以我承诺。然后我将该分支合并到了Trunk中。当我尝试提交Trunk时,它给了我错误。
有人可以指出如何解决这个问题吗?谢谢