![]() This will open up TortoiseMerge, where you can easily deal with all the conflicts, you have. Hit OK and point SourceTree to your location of TortoiseIDiff.exe and TortoiseMerge.exe.Īfter that, you can select Resolve Conflicts > Launch External Merge Tool from context menu on each conflicted file in your local repository. Select TortoiseMerge in both dropdown lists. In SourceTree open Tools > Options > Diff > External Diff / Merge. Unzip TortoiseIDiff.exe and TortoiseMerge.exe to any folder ( c:\Program Files (x86)\Atlassian\SourceTree\extras\ in my case). Get standalone version of TortoiseMerge/Diff (quite old, since it doesn't ship standalone since version 1.6.7 of TortosieSVN, that is since July 2011). ![]() ![]() I'm using SourceTree along with TortoiseMerge/Diff, which is very easy and convinient diff/merge tool. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |