Reputation: 1644
I've just started to use TFS in Visual Studio and have come across the Compare Files feature. It works great in showing the differences between two local copies of the same file, but how do I merge the changes?
In most file comparison software there is the option to Copy Left/Right or Accept Change or at the very least to edit the files directly and paste in your own code.
Visual Studio does not seem to offer any of this.
Am I missing something?
Upvotes: 0
Views: 4356
Reputation: 87
I suggest to use third-part tool. I found great even the free version of Code Compare that is both stand alone and integrated VS extension.
Upvotes: 0
Reputation: 4602
Visual Studio comare is sadly missing the options to Copy Left/Copy Right/Accept Change.
You should however be able to edit the Right side of a normal compare and the Result part of a Merge compare. Only situation where this is not possible is for solution and project files that you currently have open in the same instance of Visual Studio.
Upvotes: 1