%1 = Original file, the pre-changes file.The compare argument parameters and their meaning: and add settings for compare and merge.Ĭommand: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exeĪrguments: /title1=%6 /title2=%7 %1 %2 Merge settingsĪrguments: /m /title1=%6 /title2=%7 /title3=%8 /c=%9 %1 %3 %2 /r=%4 Compare argument parameters Then select Visual Studio Team Foundation Server -> Configure User Tools. Make sure Current source control plug-in: has Visual Studio Team Foundation Server selected. Configuring DiffMerge with TFS in Visual Studioįrom the Visual Studio toolbar select: Tools -> Options -> Source Control These are the settings I use and an explanation on the flags and arguments. I know it works, I know how to use it, I'm familiar with the layout and I can quickly navigate and scan the document. ![]() It has to be a quick and efficient process. Looking at differences in files is something every developer does often, whether it is local code changes or a code review for another member of the team. Because I’ve used it for so long I'm quite reluctant to change. Back then there was no built in diff viewer in Visual Studio so you had to use a third party tool. I've been using DiffMerge since VS2010, so pretty much forever as far as I am concerned. This post isn't to advocate DiffMerge over another file comparer, but an explanation on how to set up DiffMerge with either TFS in Visual Studio or Git. ![]() This article shows you how to configure TFS and Git to use SourceGear DiffMerge.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |