CODEWITHSUNDEEP
visual-studiovisual-studio-2010tfsmerge
croxfade
croxfade

Reputation: 63

In Visual 2010 it is not showing conflict when I merge a renamed file

So I have a file (let's call this x.txt in the following path $initial files/Development) and I branch it here ($initial files/Test). I then check in all the changes. Now I edit the x.txt file in $initial files/Development, rename it to xyz.txt check that in. And now I merge it to $initial files/Test but it does not say that there is a conflict in the name. Is this not how this is supposed to work?

I know I can delete the file from test then branch it again from development branch but I know for sure that this used to work but all of a sudden it is not working now. Any help would be highly appreciated.

Thank You

Upvotes: 0

Views: 48

Answers (1)

Vicky - MSFT
Vicky - MSFT

Reputation: 5010

No, rename will not cause a conflict.

However, you will get a conflict when you merge if the file in target branch ($initial files/Test/x.txt) in local workspace is not the latest version. So, to avoid the conflict, please first get latest version on for files on target branch and then do merge.

Upvotes: 1

Related Questions