In VS 2011, there are major improvements coming to the in-built Diff tool. But in the mean time, there is a better way to performs merges and compares – it uses the OpenSource tool WinMerge:
Here is how:
Open the options dialog: Tools –> Options and navigate to Source-Control –> Visual Studio Team Foundation Server.
![image image](https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEiRgbRByZgfvK60lMZ9GI9SIKCKG7UIaeathbp1bsDsp-3SmDG9gkJMo702eIVcUq1mxRkx4F9Blpw7-iJclFB5xu6Z3WqhYbkgjW5Zbv_ek2nWyJZ4dkoqbAxZCc5T8Wqog3U1mg/?imgmax=800)
Click on Configure User Tools….
![image image](https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjPHslPNT-GSTp1x5R2fJmDa9pLz-I0Fzy6cc42_gOPZ32p15H-7i5iJI5xjNUqNBlMO9bBx5jUUMpQMS4OhXHSQ7ubUbtIC3JapI3X8nGYzD6nnDh6p4AO7T8XtmtDw_2mYTcCdg/?imgmax=800)
Click on Add
Click on Add again and this time setup the Merge tool.
note: the Arguments are different between the Compare and Merge settings.
And now you should have a much more powerful way to compare and merge files:
![image image](https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEiBe8jHT0BW-TqENUQtxmMQV95u8Myz9dWc7j29HB4rU6-TCU8-t2yQKHXYkFBH9wUKwp8FcZmOIlnHPrLuf8k5ap_I9JRcjHCoixIecnLCEs3OihvCeN-AozwSaqunQBQO2P0FRA/?imgmax=800)
Here is how:
Open the options dialog: Tools –> Options and navigate to Source-Control –> Visual Studio Team Foundation Server.
Click on Configure User Tools….
Click on Add
Extension: .* Operation: Compare Command: path to WinmergeU.exe Arguments: /e /u /x /wl /wr /dl %6 /dr %7 %1 %2 /maximize |
Extension: .* Operation: Merge Command: path to WinmergeU.exe Arguments: /e /u /x /wl /dl %6 /dr %7 %1 %2 %4 /maximize |
And now you should have a much more powerful way to compare and merge files:
No comments:
Post a Comment