CODEWITHSUNDEEP
visual-studio-2008tfs
Mithil
Mithil

Reputation: 3770

Files did not merge properly in TFS 2008

I had branched one of my projects few months back and merged it back today. It said it merged around 460 files but I don't see any of my changes in the original project. I also added few new files to the branched project which got merged but my other code changes did not. Any idea how can I fix this?

When I try to merge now, it says both the files are identical but I can see the difference when I open the files next to each other. I have too many changes to go through each file individually.

Thanks in advance.

Mithil

Upvotes: 1

Views: 281

Answers (2)

Mithil
Mithil

Reputation: 3770

For some reason TFS couldn't recognize the difference in my files. I had to manually go into each file and copy the changes to the original file. Not a very pleasant experience.

Upvotes: 0

Mike Veigel
Mike Veigel

Reputation: 3815

Download TFS Powertools and run tf merge and do a /force. This happens when the cached version is incorrect.

Merge Command

An example would be:

c:\MyProject>tf merge /version:C100 branch1 branch2 /recursive /force

Upvotes: 2

Related Questions