Subversion: merge moved file

Question

I've moved (renamed) a file in a local SVN directory:

svn move src_file_path dst_file_path

When I've tried to svn up , I got:

D     C src_file_path
      >   local delete, incoming edit upon update

This means someone else edited the file that I moved.

How do I merge the changes made by the other contributor into the new location?

PS - This is the same branch, unlike this question .

Answer 1

You got a tree conflict. Take the Show > Tree Conflicts option and then take the Resolve option on the tree conflict. This will launch a wizard that gives you options based on the conflict. In this case, one of those will help you merge changes into the new location.

Answer 2

合并WC中的文件与回购中的文件