Best Merge Tool For Sourcetree

Allows automatic merging (when safe to do so) and full control over editing the resulting file. Folder Diff Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different. You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source. You can also try the P4 Merge tool from Perforce which is offered for free. Both options can be selected as a Diff/Merge Tool in SourceTree.

This article was updated for Visual Studio 2017.

Today, a short note on how to set up Visual Studio as a diif and merge tool in SourceTree and Git client. It’s not commonly known that this IDE may be used for resolving merge conflicts, but as you’ll see it’s very simple to set up.

SourceTree config

First, open up the options window and go to Diff tab.

Change both External Diff Tool and Merge Tool to Custom. 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 Common7IDE subfolder. Visual Studio 2017 has it slightly more hidden. Look under Common7IDECommonExtensionsMicrosoftTeamFoundationTeam Explorer.

As for the arguments fields, type in the following:

Diff tool: '$LOCAL' '$REMOTE' 'Source' 'Target' //t
Merge tool: '$LOCAL' '$REMOTE' '$BASE' '$MERGED' //m

MergeBest Merge Tool For Sourcetree

Click OK, and And that’s it! Now whenever a merge conflict occurs, you’ll be able to resolve it using Visual Studio.

The only downside I found is that vsdifftool may take quite some time to start up. But if you don’t close it after diffing each file, it’ll work like a charm.


Commandline Git config

By saving these settings in SourceTree, your .gitconfig file is updated with two entries: [difftool “sourcetree”] and [mergetool “sourcetree”]. In my case it looks like the following:

cmd='C:/Program Files (x86)/Microsoft Visual Studio 2015/Common7/IDE/vsdiffmerge.exe'$LOCAL$REMOTE Source Target//t
cmd='C:/Program Files (x86)/Microsoft Visual Studio 2015/Common7/IDE/vsdiffmerge.exe'$LOCAL$REMOTE$BASE$MERGED//m

You can now use these to tell the commandline Git to use these when viewing a diff or merging. It’s as simple as executing two git commands:

Best Merge Tool For Sourcetree

Sourcetree Reverse Merge

git config --global diff.tool sourcetree
git config --global merge.tool sourcetree

Sourcetree Undo Merge


Now, git difftool and git merge commands will launch Visual Studio.

Doing so is of course perfectly possible even without SourceTree. Just add the difftool and mergetool entries to your .gitconfig file (it should be located in your home folder) and execute the two git config commands shown above.