It’s not commonly known that that Visual Studio may be used for viewing file diffs and resolving merge conflicts. You’ll see how easy it is to set it up with SourceTree and commandline Git client.