![]() After that, you can select Resolve Conflicts Launch External Merge Tool from context menu on each conflicted file in your local repository. Hit OK and point SourceTree to your location of TortoiseIDiff.exe and TortoiseMerge.exe. ![]() Select TortoiseMerge in both dropdown lists. In SourceTree open Tools Options Diff External Diff / Merge. ![]()
0 Comments
Leave a Reply. |