IDEA Error:svn: E195016: Merge tracking not allowed with missing subtrees

原因:

使用IDEA SVN将分支代码合并到主干时,报如下错误

Error:svn: E195016: Merge tracking not allowed with missing subtrees; try restoring these items first:
Changelist(s) :
xxx (***) merging faced problems
Skipped changelists: xxx (***) 

参考:

https://youtrack.jetbrains.com/issue/IDEA-125955

解决:

将Version Control -> Local Changes -> Locally Deleted中的变更还原或删除

你可能感兴趣的:(IDEA Error:svn: E195016: Merge tracking not allowed with missing subtrees)