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. Today, a short note on how to set up Visual Studio as a diif and merge tool in SourceTree and Git client. This article was updated for Visual Studio 2017.Ī pull and merge example for SourceTree with a github repository (note we are taking all of the changes you have made so far to class content). Type the path to UnityYAMLMerge in the Merge Command text field. Select Custom in the Merge Tool dropdown. I recently started using Sourcetree and noticed merging files is tricky until I stumbled upon the various visual merge tools. Allows automatic merging (when safe to do so) and full control over editing the resulting file. Merge Graphically shows the changes between 3 files.

I just tried Araxis, DiffMerge and KDiff3 here (I usually use P4Merge personally) and they all worked fine when I chose them. If you want SourceTree to configure a tool you should just be able to select the one of your choosing from the drop-down.

Araxis merge visual studio 2017