automatically resolve (some) tree conflicts

Hello,

nailing down some tree conflicts show that there are no differences at all
comparing merged versions. One example is a file that has the same name,
path and content, but was removed/added meanwhile, and Subversion lost the
tracking that it is exactly the same file than before. Is there a tool or
command to automatically resolve such sort of tree conflicts?

Thank you.

Regards
Michael
Received on 2012-08-20 12:14:45 CEST