developers.de
daenet's .NET Community
Scott Munro » Update to WinMerge with TFS

Update to WinMerge with TFS

I recently linked to one of Rory's posts in which he described how to set up Visual Studio to use WinMerge as a comparison and merge tool. After some head scratching, I realised that he has one switch too many in the Merge operation. I would suggest that you remove the '%3' and the /wl which means that the full set of arguments should be as follows.

/x /e /ub /dl %6 /dr %7 %1 %2 %4

The symptoms that I was seeing were that the wrong file from the server was being displayed and that I could not resolve conflicting changes.

Posted Aug 09 2007, 07:25 PM by Scott Munro
Filed under: , ,

Comments

Using WinMerge with TFS - Rory Primrose wrote Using WinMerge with TFS - Rory Primrose
on 08-10-2007 1:42

Pingback from  Using WinMerge with TFS - Rory Primrose

Rory Primrose wrote re: Update to WinMerge with TFS
on 08-10-2007 1:43

Hi Scott,

Thanks for your feedback. I have updated my post to remove %3, but I still like /wl because I don't want the server version to be editable.

http://developers.de/blogs/scott_munro/archive/2007/08/09/update-to-winmerge-with-tfs.aspx wrote http://developers.de/blogs/scott_munro/archive/2007/08/09/update-to-winmerge-with-tfs.aspx
on 03-27-2008 10:22

Add a Comment

(required)  
(optional)
(required)  
Remember Me?