AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |
Back to Blog
Guiffy vs beyond compare1/4/2023 ![]() ![]() First, there is "tree merge", which you do via the Merge Wizard in the UI or via the "tf merge" command from the command-line. ![]() ![]() This UI is available via tools -> options -> source control -> visual studio team foundation server -> "configure user tools" button or via the command-line with "tf diff /configure" For additional background, try to remember that there are 2 operations that both involve "merge", so we on the TFVC team have tried to use 2 different terms to help clarify which operation is being talked about. The purpose of this article is to start collecting the most common ones we know or heard about in a central place so people don't have to figure these out on their own. #Guiffy vs beyond compare windowsAdd reg for TFS diff/merge tool configure: Windows Registry Editor Version 5.00 "Command"="D:\\Beyond Compare 2\\BC2.exe" "Arguments"="%1 %2 /title1=%6 /title2=%7" "Command"="D:\\Beyond Compare 2\\BC2.exe" "Arguments"="%1 %2 /savetarget=%4 /title1=%6 /title2=%7" "Command"="D:\\Beyond Compare 2\\BC2.exe" "Arguments"="%1 %2 /title1=%6 /title2=%7" diff/merge configuration in Team Foundation - common Command and Argument valuesOne of the extensibility points we have in Team Foundation V1 is that you can configure any other diff and merge tools you want. ![]()
0 Comments
Read More
Leave a Reply. |