svn - 为什么相同文件之间会出现树冲突？

Question

我有我的树干，我有一个 Twig :toast。我对 toast 分支进行了更改，并希望将它们合并回主干。之前已经做过很多次了，没想到会遇到什么问题。

我有一个完全没有改变的图像目录，也没有目录的路径。 有人可以向我解释为什么目录中的每个图像都会发生树冲突吗？

Answer 1

当我有一个从主干保持最新的分支，然后将该分支合并回主干时，我在文件上遇到了树冲突。

这些冲突看起来像这样:

C   path/to/some/file.ext>   local add, incoming add upon mergeC   path/to/some/other/file.ext>   local delete, incoming delete upon merge 

So it's always the same exact change (verified by inspecting the diff), but seems that SVN is not smart enough to know that the remote change (from the branch) came from the local change (trunk) as I was keeping the branch updated.

When I know this to be the case, I just resolve them all:

$ svn resolve --accept working -R .

注:svn版本1.7.19