Merging when one branch moved a file and a different branch modified it in place.
When resolving a merge conflict in VSO where one branch moved a file and a different branch modified the file in place there isn't a easy way to accept the modifications in the file's new location.
I believe git knows the difference between a file delete and file move and this is possible?
Kurt Diegert commented
Thinking about this more. Should this situation even create a merge conflict? If branch 1 moved foo.txt to bar.txt and branch 2 added a line to foo.txt then they should be automatically merged -- just add the new line to bar.txt.
The key is knowing the difference between when a file is deleted and when a file is moved, and I believe git does know the difference.