Integrating with Source Control, Configuration Management and Other Applications

Оглавление:



Integrating with Source Control, Configuration Management and Other Applications

Merge for macOS integrates with most version control (VC), software configuration management (SCM) and other applications that allow a third-party file comparison (diff) or file merging tool to be specified. This page contains instructions for integrating Merge with the following applications:

Integration with many SCM systems requires the Professional Edition of Merge to enable the comparison of two modified versions of a file with their common ancestor.

Other applications

If your chosen application isn’t listed on this page, you may find the information for integrating Merge for Windows with other applications to be a helpful starting point. You may also be able to integrate Merge with another application yourself, using the Merge AppleScript API or command-line utility.

If you have instructions for integrating Merge with other systems, or corrections to the information presented below, please contact us to let us know so that we can update this list.

AccuRev

The AccuRev macOS client can be configured to use Araxis Merge for file comparison and merge operations.

These steps are believed to work with AccuRev 5.2.

To configure the AccuRev client to use Merge for file comparison:
To configure the AccuRev client to use Merge for file merging:

Cornerstone

Zennaware Cornerstone is a Subversion client that has built-in support for Merge. The following instructions have been tested with Cornerstone v2.7.9.

To configure Cornerstone to use Merge:

Dreamweaver

Adobe (Macromedia) Dreamweaver CS6 integrates with Araxis Merge and can launch a two-way file comparison. Consequently, the Standard Edition of Merge is sufficient if you will be using it only with Dreamweaver.

The following instructions have been tested with Dreamweaver CS6 v12.0.

To configure Dreamweaver CS6 to use Merge as the file comparison tool:

Eclipse

For Eclipse, see the entry for Subclipse.

Git

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

Git can also be configured to use Merge for file comparison and merge operations.

The following configuration steps have been tested with Git v1.7.12.4.

To use Araxis Merge for file comparison and file merging:

IntelliJ IDEA/PhpStorm

IntelliJ IDEA and PhpStorm can be configured to use Merge for file and folder comparisons, and also for file merging. The following steps have been tested with IntelliJ IDEA 12.1.1.

To configure IntelliJ IDEA/PhpStorm to use Merge as the file and folder comparison tool:
To configure IntelliJ IDEA/PhpStorm to use Merge as the merging tool:

MacHg

MacHg is a fully featured free Mercurial client for macOS. MacHg provides built-in support for Araxis Merge.

The following instructions have been tested with MacHg v0.9.25.

To configure MacHg to use Merge:

Mercurial

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

Mercurial can also be configured to use Merge for file/folder comparison and file merge operations. The comparison integration uses the Extdiff extension, which is supplied with Mercurial.

The following instructions have been tested with Mercurial v1.8.4.

To configure Mercurial to use Araxis Merge for file merging:
To configure Mercurial to use Araxis Merge for file comparison:
Examples of using hg arxdiff:

Path Finder

Path Finder can be configured to use Araxis Merge for file comparison. Allowing the launching of Merge from Path Finder’s Compare… context menu when two files are selected.

The following instructions have been tested with Path Finder 7.

To configure Path Finder to use Merge for file comparison:

Perforce

Merge integrates tightly with Perforce. Araxis provides a Perforce File System Plugin to enable Merge to browse Perforce depots directly. This means that, for example, you can compare branches of source code directly within a depot without syncing them to the client workspace. Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).

To browse Perforce repositories directly from Merge:
To configure P4V (2007.2 release or later) to use Merge for file comparison and merging:
To configure the Perforce command-line tool (p4) to use Merge:

SmartGit/Hg

SmartGit/Hg can be configured to use Araxis Merge for file comparison and merge operations.

To configure SmartGit/Hg to use Araxis Merge for file comparison:
To configure SmartGit/Hg to use Araxis Merge for file merging:

SmartSVN/SmartCVS

SmartSVN and SmartCVS clients can be configured to use Araxis Merge for file comparison and merge operations.

Note that the ability to use an external tool for solving conflicts is not available in the Foundation version of SmartCVS.

The following instructions have been tested with SmartSVN v7.5.4.

To configure SmartSVN/SmartCVS to use Araxis Merge for file comparison:
To configure SmartSVN/SmartCVS to use Araxis Merge for file merging:

SourceTree

Atlassian SourceTree is a client for Git and Mercurial. The following instructions have been tested with SourceTree v1.6.0.

To configure SourceTree to use Merge for comparing files:
To configure SourceTree to use Merge for merging files:

Subclipse

Subclipse is an Eclipse plugin providing support for Subversion within the Eclipse IDE. It can be configured to use Merge as its merging tool. Merge will then be used whenever you choose Edit Conflicts from a Team menu in Eclipse.

Merge can also integrate directly with Subversion. Please see Subversion section for more information.

The following steps have been tested with Subclipse v1.8.18, Eclipse v4.2.1 and Subversion v1.6.18

To configure Merge as the Subclipse file merging tool:

Subversion

Merge integrates well with Subversion. Araxis provides a Subversion File System Plugin to enable Merge to browse Subversion repositories directly. This means that, for example, you can compare branches of source code directly within a repository without syncing them to the client workspace. Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).

See also the entries for Subversive, svnX and Subclipse.

To browse Subversion repositories directly from Merge:
To configure the Subversion command-line tool (svn) to use Merge:

Subversive

Subversive, the official Eclipse plugin can be configured to use Merge as its merging tool. It provides support for Subversion within the Eclipse IDE. Merge will then be used for file comparisons, and for merging whenever you choose Edit Conflicts from a Team menu in Eclipse.

Merge can also integrate directly with Subversion. Please see Subversion section for more information.

The following steps have been tested with Subversive v1.0.0, Eclipse v4.2.1 and Subversion v1.6.18

To configure Merge as the Subversive file comparison and merging tool:

Surround SCM

Surround SCM has built-in support for Araxis Merge. To set Araxis Merge as the default application for file comparison and merging:

  • Choose User Options… from the Tools menu.
  • Select the Diff/Merge tab.
  • Edit the settings for a selected file type.
  • Select Araxis Merge from the comparison application drop-down list.

Please see the Surround SCM website for more details.

svnX

svnX is an open source GUI for most features of the Subversion client. It has built-in support for Merge.

To configure svnX to use Merge:

Tower

Tower is a client for Git that can be easily configured to use Araxis Merge as its preferred comparison and merging tool. The following instructions have been tested with Tower v1.5.0.

To configure Tower to use Merge:

Veracity

Veracity is an Open Source, distributed version control and bug tracking system for Windows, macOS, and Linux. SourceGear, the company behind Veracity, has helpfully provided the information here.

Veracity supports Araxis Merge out of the box for both diff and merge operations. Simply use --tool araxis with any command that supports external comparison or merging tools. Alternatively, you can configure Merge as your default tool for various operations as described below.

For support using Veracity with Araxis Merge, please see http://veracity-scm.com/qa.

To make Araxis Merge the default interactive comparison tool for text files:
To make Araxis Merge the default interactive comparison tool for binary files:
To make Araxis Merge the default interactive merging tool for text files:
To make Araxis Merge the default interactive merging tool for binary files:

Versions

The Versions client for Subversion can be easily configured to use Araxis Merge. The following instructions have been tested with Versions v1.2.2.

To configure Merge as the Versions comparison tool:

https://www.araxis.com/merge/documentation-os-x/integrating-with-other-applications.en

Губарь Маргарита Александровна