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

Bertha 。 2022-03-15 11:12 157阅读 0赞

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

原文：[http://www.araxis.com/merge/scm\_integration.html][http_www.araxis.com_merge_scm_integration.html]

## **Git (msysGit)** ##

Merge integrates tightly with [Git][] [![This link is to an external website][]][Git]. 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, see[Comparing Text Files (or Typed/Pasted Text)][Comparing Text Files _or Typed_Pasted Text].

[msysGit][] [![This link is to an external website][]][msysGit] 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][]][Git configuration file] 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*][git difftool]  [![This link is to an external website][]][git difftool] command. To resolve conflicting changes after merging files from a branch or remote repository, use  [*git mergetool*][git mergetool]  [![This link is to an external website][]][git mergetool].

#### **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][]][Git configuration file] 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.exe*and *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*][git diff]  [![This link is to an external website][]][git diff] command. To resolve conflicting changes after merging files from a branch or remote repository, use  [*git mergetool*][git mergetool]  [![This link is to an external website][]][git mergetool].

## **Git (Cygwin)** ##

Git on [Cygwin][] [![This link is to an external website][]][Cygwin] 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][]][Git configuration file] 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*][git difftool]  [![This link is to an external website][]][git difftool] command. To resolve conflicting changes after merging files from a branch or remote repository, use  [*git mergetool*][git mergetool]  [![This link is to an external website][]][git mergetool].

[http_www.araxis.com_merge_scm_integration.html]: http://www.araxis.com/merge/scm_integration.html#msysGit
[Git]: http://git-scm.com/
[This link is to an external website]: http://d3vh5jbdnispon.cloudfront.net/Img/Link.gif
[Git File System Plugin]: http://www.araxis.com/merge/topic_plugin_git.html
[Versions button]: /images/20220315/efea832bd14842a4afe865ade3d542a5.png
[Comparing Text Files _or Typed_Pasted Text]: http://www.araxis.com/merge/topic_comparing_text_files.html#versions-button
[msysGit]: http://code.google.com/p/msysgit/
[Git configuration file]: http://schacon.github.com/git/git-config.html#_configuration_file
[git difftool]: http://schacon.github.com/git/git-difftool.html
[git mergetool]: http://schacon.github.com/git/git-mergetool.html
[git diff]: http://schacon.github.com/git/git-diff.html
[Cygwin]: http://www.cygwin.com/