zoukankan      html  css  js  c++  java
  • Using Beyond Compare with TFS

    In order to configure Visual Studio to use Beyond Compare for a compare operation choose the following options:
    1. Select: Tools –> Options –> Expand Source Control –> Choose “Visual Studio Team Foundation Server.
    2. Select: “Configure User Tools.”
    3. Click the “Add” button.
    4. Enter “.*” in the “Extension” edit box.
    5. Choose “Compare” in the “Operation” combo box.
    6. Enter the path to BComp.exe in the “Command” edit box.
    7. Enter the command line parameters from the table below.
    To configure TFS to use Beyond Compare for a merge operation follow the same steps above but choose “Merge” for the operation instead and provide the
    correct merge command line in the table below the compare table.
    *Remember: Beyond Compare 3 Pro supports 3 way merging and the standard edition of it does not. Also 3 way merging is new to Beyond Compare as of version
    3, so this feature is not present in version 2 of the product.
    To summarize the following command line parameters are ones I’ve found to be of the most use:
    Compare
    Product Command Arguments
    TFS (Default) diffmerge.exe %1 %2 %6 %7 %5 /ignorespace
    Beyond Compare 2 BComp.exe %1 %2 /title1=%6 /title2=%7
    Merge
    Product Command Arguments
    TFS (Default) diffmerge.exe /merge %1 %2 %3 %4 %6 %7
    Beyond Compare 2 BComp.exe %1 %2 /title1=%6 /title2=%7
    Beyond Compare 3 (Standard – no 3-way Merge) BComp.exe %1 %2 /savetarget=%4 /title1=%6 /title2=%7
    Beyond Compare 3
    (Pro / 3-way merge)

  • 相关阅读:
    二维数组中的查找--python实现
    redis 学习笔记二
    redis 学习笔记(一)
    mysql sql知识总结
    工作或日常生活工具网站
    Git冲突:commit your changes or stash them before you can merge. 解决办法
    pandas 学习二
    python supervisor 守护进程 防止进程掉线
    pandas 学习
    django 定时器
  • 原文地址:https://www.cnblogs.com/gylhaut/p/5504632.html
Copyright © 2011-2022 走看看