Git 集成 Araxis Merge 作为比较和合并GUI工具的配置

更多有关 Araxis Merge的配置,请参考下面原文.

原文:http://www.araxis.com/merge/scm_integration.html

Git (msysGit)

Merge integrates tightly with Git This link is to an external website. Araxis provides a Git File System Plugin to enable Merge to access files in Git depots directly. Merge is also able to populate the Versions button button drop-down versions menu with other revisions of each file being compared. For more information, seeComparing Text Files (or Typed/Pasted Text).

msysGit This link is to an external website can also be configured to use Merge for file comparison and merge operations.

Newer Git versions

As of v1.6.4, Git includes support for Araxis Merge. The following configuration step has been tested using msysGit v1.7.1.

To use Araxis Merge for file comparison and file merging with msysGit v1.6.4 or later:
  • Update the appropriate Git configuration file This link is to an external website by adding the following diff and merge tool configurations:

    [diff]
    tool = araxis
    [difftool "araxis"]
    path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe
    
    [merge]
    tool = araxis
    [mergetool "araxis"]
    path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe
    

    Note: in the above paths, replace C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe with the full path to the Merge compare.exe command-line utility that you have installed on your machine. Note the use of double-backslashes to separate path elements.

  • To compare files, use the  git difftool  This link is to an external website command. To resolve conflicting changes after merging files from a branch or remote repository, use  git mergetool  This link is to an external website.
Legacy Git versions

Versions of msysGit prior to v1.6.4 can be configured to use Merge with the instructions below (tested with msysGit v1.6.1).

To use Araxis merge for file comparison and file merging with older versions of msysGit:
  • Update the appropriate Git configuration file This link is to an external website by adding the following diff tool configuration:

    [diff] 
    external = C:\\Program Files\\Araxis\\Araxis Merge\\araxisgitdiff.exe
    renames = true
    
    [mergetool "araxis"] 
    cmd = 'C:\\Program Files\\Araxis\\Araxis Merge\\araxisgitmerge.exe' "$REMOTE" "$BASE" "$LOCAL" "$MERGED"
    trustExitCode = false
    
    [mergetool]
    keepBackup = false
    
    [merge] 
    tool = araxis
    stat = true

    Note: in the above paths, replace C:\\Program Files\\Araxis\\Araxis Merge\\araxisgitdiff.exeand C:\\Program Files\\Araxis\\Araxis Merge\\araxisgitmerge.exe with the full paths to the Merge araxisgitdiff.exe and araxisgitmerge.exe command-line utilities that you have installed on your machine. Note the use of double-backslashes to separate path elements.

  • To compare files using older versions of Git, use the  git diff  This link is to an external website command. To resolve conflicting changes after merging files from a branch or remote repository, use  git mergetool  This link is to an external website.

Git (Cygwin)

Git on Cygwin This link is to an external website can be configured to use Merge for file comparison and merge operations.

The following configuration step has been tested using the Cygwin distribution of Git v1.7.1.

To use Araxis Merge for file comparison and file merging:
  • Update the appropriate Git configuration file This link is to an external website by adding the following diff and merge tool configurations:

    [diff]
    tool = araxis
    [difftool "araxis"]
    cmd = '/cygdrive/c/Program Files/Araxis/Araxis Merge/Compare.exe' /2 /wait `cygpath -w $LOCAL` `cygpath -w $REMOTE`
    
    [merge]
    tool = araxis
    [mergetool "araxis"]
    cmd = '/cygdrive/c/Program Files/Araxis/Araxis Merge/Compare.exe' /3 /a2 /wait `cygpath -w $REMOTE` `cygpath -w $BASE` `cygpath -w $LOCAL` `cygpath -w $MERGED`

    Note: in the above paths, replace /cygdrive/c/Program Files/Araxis/Araxis Merge/Compare.exe with the full path to the Merge compare.exe command-line utility that you have installed on your machine.

  • To compare files, use the  git difftool  This link is to an external website command. To resolve conflicting changes after merging files from a branch or remote repository, use  git mergetool  This link is to an external website.

评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值