TEAM FOUNDATION SERVER (TFS)
Diff
- In Visual Studio Choose Options from the Tools menu.
- Expand Source Control in the treeview.
- Click Visual Studio Team Foundation Server in the treeview.
- Click the Configure User Tools button.
- Click the Add button.
- Enter ".*" in the Extension edit.
- Choose Compare in the Operation combobox.
- Enter the path to BComp.exe in the Command edit.
- In the Arguments edit, use:
%1 %2 /title1=%6 /title2=%7
3-way Merge ![Pro only](https://lh3.googleusercontent.com/blogger_img_proxy/AEn0k_t5rsTp5P67LtyL_E8z6q_joNVq3VwfuAAdse6VbABDYTTZD77tBJvazjkxEklFDlfC6wiGM5KRyZVbK4MKb73XXQUnFabOSV5nczKROlvjP1iIQ7TT=s0-d)
- Follow steps 1-6 above.
- Choose Merge in the Operation combobox.
- Enter the path to BComp.exe in the Command edit.
- In the Arguments edit, use:
%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
2-way Merge
Use the same steps as the 3-way merge above, but use the command line:
%1 %2 /savetarget=%4 /title1=%6 /title2=%7
No comments:
Post a Comment