Launch External Merge Tool For Sourcetree Mac

admin

Our favorite (and free) visual diff and merge tool for OS X (as well as Linux and Windows) is DiffMerge. It makes resolving nasty Git branch conflicts a snap (relatively speaking). Here’s how to install it and configure it with Git on OS X:

SourceTree (com.torusknot.sourcetreenotmas) is a Mac software application that has been discovered and submitted by users of Aploader. The latest version that our users have reported running on their systems is SourceTree 75.The most popular version of this application used by our users is SourceTree 104. New Videos on Merge Conflicts in SourceTree. 70% OFF Git with Bitbucke. Barring using a visual tool like SourceTree to find out what happened to a file you can use. Open the file in editor of choice (i.e. IntelliJ or vim). Git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false.

Download the DiffMerge OS X installer. Be sure to download the Installer version. There’s also a DMG version but then you’ll have to manually install the diffmerge command line script.
Once you’ve downloaded it go into terminal and make sure you can run it from the command line by typing diffmerge and hitting return.

Change both External Diff Tool and Merge Tool to Custom. In the Diff Command field enter the full path to the vsdiffmerge.exe. In the Diff Command field enter the full path to the vsdiffmerge.exe. For VS 2015 and below you can find it in the Visual Studio installation folder, under Common7 IDE subfolder. Launch external merge tool does not actually launch anything Aleksandr Osadchenko Dec 08, 2016 Yeah, I know, I read all the previous questions and supposed answers. SRCTREEWIN-4713 SourceTree crashes in the middle of a visual merge (Merge using external tool) Closed SRCTREEWIN-4853 Crashes after closing external merge tool.

To configure Git to use DiffMerge run these commands from the command line:

git config--global diff.tool diffmerge
git config--global difftool.diffmerge.cmd 'diffmerge '$LOCAL' '$REMOTE'
git config--global merge.tool diffmerge
git config--global mergetool.diffmerge.cmd 'diffmerge --merge --result='$MERGED' '$LOCAL' '$(if test -f '$BASE'; then echo '$BASE'; else echo '$LOCAL'; fi)' '$REMOTE'
git config--global mergetool.diffmerge.trustExitCode true

Now, whenever you want it to launch diffs just use difftool where you’d normally use diff:

# diff the local file.m against the checked-in version
git difftool file.m
# diff the local file.m against the version in some-feature-branch
git difftool some-feature-branch file.m
# diff the file.m from the Build-54 tag to the Build-55 tag
git difftool Build-54.Build-55 file.m

To resolve merge conflicts, just run git mergetool:

Related

Mac OS X Only

Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions submitted by our users. Let us know if you have one to add to the list.

Index:
Cornerstone SVNGitGit ForkIntelliJ IDEA 12Mercurial 2.4.2PerforceSmartCVSSmartSVNSourceTreeSubversionSyncovery MacTower (Git)

Cornerstone SVN

In Cornerstone, you can specify a custom external compare script.

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

DIFF

Create an AppleScript wrapper for use by Cornerstone:

Sourcetree External Merge Tool

Set in PreferencesGeneralExternal compare toolOther Script..

Git

Git 2.3 and newer

(Note: Use bc3 on the command line for BC version 4. Caused by git legacy support from Linux.)

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

In a terminal:Launch External Merge Tool For Sourcetree Mac
git config --global diff.tool bc3

To launch a diff using Beyond Compare, use the command: git difftool file.ext

Merge

In a terminal:
git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true

To launch a 3-way merge using Beyond Compare, use the command: git mergetool file.ext

Like several of its competitors, MiniTool Data Recovery both ships with a bootable CD as well as offers a utility to create a boot volume from a CD, DVD, or USB flash drive. Launch the MiniTool Boot Media Builder application, select a CD, DVD, or USB flash drive for it to use, give it a few minutes and you now have a bootable MiniTool Data Recovery drive that you can option-boot into if need be. Installation wizard for mac.


Older versions of Git

  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Add the following lines to $HOME/.gitconfig:
    [diff]
    tool = bcomp
    [difftool]
    prompt = false
    [difftool 'bcomp']
    trustExitCode = true
    cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE'
    [merge]
    tool = bcomp
    [mergetool]
    prompt = false
    [mergetool 'bcomp']
    trustExitCode = true
    cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE' '$BASE' '$MERGED'
  3. To launch a diff in Beyond Compare, use: git difftool file.ext
    To launch a merge in Beyond Compare, use: git mergetool file.ext

Git Fork

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

  1. Select Preferences from the Fork menu.
  2. Select Integration.
  3. Select 'Beyond Compare' from the External Diff Tool drop down.

Merge

  1. Select Preferences from the Fork menu.
  2. Select Integration.
  3. Select 'Beyond Compare' from the Merge Tool drop down.

IntelliJ IDEA

(Potentially, also RubyMine, Webstorm, PyCharm, PhpStorm)

The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

In IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:

Originally a product for Microsoft Windows, the Beyond Compare team has contributed a fine diff tool to the Mac platform. Like Araxis Merge and DeltaWalker, it goes beyond (pun intended) comparing simple text and also allows diffing Word and PDF contents. What is the best git merge tool for the Mac? Update Cancel. Diff Tools on Mac OS X. 24.5k Views View 7 Upvoters. Thank you for your feedback! Your feedback is private. Is this answer still relevant and up to date? “The legendary Git GUI client for Windows, Mac and Linux.” Check it out. Related Questions. I really hate visualizing diffs using the default UNIX diff tool. Is it possible to do view git diffs using a GUI tool that will nicely display the local and remote side-by-side, similar how it is possible to set the mergetool to be DiffMerge and when you do. Git mergetool myfile.txt. Git diff tool for mac. Git comes with built-in GUI tools for committing and browsing (), but there are several third-party tools for users looking for platform-specific experience.If you want to add another GUI tool to this list, just follow the instructions. All Windows Mac Linux Android iOS.

Compare folders
Path to executable: /usr/local/bin/bcomp

Merge Tool For Git

Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool

Diff Merge Tool For Mac


Path to executable: /usr/local/bin/bcomp
Parameters: %1 %2 %3 %4

Mercurial 2.4.2

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Perforce

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Git Merge Tool Mac

Diff

  1. Go to the P4V menu and select Preferences.
  2. Go to the Diff section and select Other application.
  3. Location: /usr/local/bin/bcomp
  4. Arguments: %1 %2

Merge

  1. Go to the P4V menu and select Preferences.
  2. Go to the Merge section and select Other application.
  3. Location: /usr/local/bin/bcomp
  4. Arguments: %1 %2 %b %r

SmartCVS

  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Launch SmartCVS, select PreferencesFile Comparators.
  3. Select * in the table and click edit.
  4. Add /usr/local/bin/bcomp in Command and ${leftFile} ${rightFile} in Arguments.
  5. Click OK.

SmartSVN

  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Launch SmartSVN, select PreferencesFile Comparators.
  3. Select * in the table and click edit.
  4. Add /usr/local/bin/bcomp in Command and ${leftFile} ${rightFile} in Arguments.
  5. Click OK.

SourceTree

From the Beyond Compare menu, Install Command Line Tools. Then:

Subversion

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

Create a file named /usr/local/bin/bcdiff.sh and allow execute permissions (chmod +x). Add the following lines:
/usr/local/bin/bcomp '$6' '$7' -title1='$3' -title2='$5' -readonly
exit 0

Edit $HOME/.subversion/config and add the line diff-cmd = /usr/local/bin/bcdiff.sh in [Helpers].

Merge

Create a file named /usr/local/bin/bcmerge.sh and allow execute permissions (chmod +x). Add the following line:
/usr/local/bin/bcomp '$2' '$3' '$1' '$4'

Edit $HOME/.subversion/config and add the line merge-tool-cmd = /usr/local/bin/bcmerge.sh in [Helpers].

Syncovery Mac

The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Launch External Merge Tool For Sourcetree Mac Download

Then to configure Syncovery:

  1. Select menu Syncovery/Preferences.
  2. Click the Misc tab.
  3. In the field Program used to compare files from the Sync Preview, write /usr/local/bin/bcompare (or the pathname given when using BC4's Install Command Line Tools).
  4. Click Close.

Tower (Git)

(Requires Tower 2.0.5 or newer)
  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Open Tower's preferences dialog on the Git Config Tab.
  3. Set the Diff Tool drop-down to Beyond Compare.
  4. Set the Merge tool drop-down to Beyond Compare.