开发者社区> 雪梦科技> 正文

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.

版权声明:本文内容由阿里云实名注册用户自发贡献,版权归原作者所有,阿里云开发者社区不拥有其著作权,亦不承担相应法律责任。具体规则请查看《阿里云开发者社区用户服务协议》和《阿里云开发者社区知识产权保护指引》。如果您发现本社区中有涉嫌抄袭的内容,填写侵权投诉表单进行举报,一经查实,本社区将立刻删除涉嫌侵权内容。

相关文章
《React Native移动开发实战》一一2.2 Git版本控制工具
本节书摘来自华章出版社《React Native移动开发实战》一 书中的第2章,第2.2节,作者:袁林 著 ,更多章节内容可以访问云栖社区“华章计算机”公众号查看。
1813 0
好工具推荐系列:github上fork了别人的项目后,再同步更新新的版本(★firecat个人实践★)
好工具推荐系列:github上fork了别人的项目后,再同步更新新的版本(★firecat个人实践★)
178 0
网络属性配置及常用工具_学习笔记
时间:2017.12.09作者:李强参考:man,info,magedu讲义,万能的internet实验环境:CentOS 6.9与CentOS7.4声明:以下英文纯属个人翻译,英文B级,欢迎纠正,以下内容纯属个人理解,并没有对错,只是参考,盗版不纠,才能有限,希望不误人子弟为好。
918 0
+关注
雪梦科技
专注Android应用研发,性能优化,移动安全等领域。
457
文章
6
问答
文章排行榜
最热
最新
相关电子书
更多
OceanBase 入门到实战教程
立即下载
阿里云图数据库GDB,加速开启“图智”未来.ppt
立即下载
实时数仓Hologres技术实战一本通2.0版(下)
立即下载