I'm using SourceTree along with TortoiseMerge/Diff, which is very easy and convenient diff/merge tool. But, because it isn't that easy and convenient to install and configure both tools, I wrote this simple memo-post to have check-list for future reference in one place.
- 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). Links and details in this answer.
TortoiseMerge.exeto any folder (
c:Program Files (x86)AtlassianSourceTreeextrasin my case).
In SourceTree open
Tools > Options > Diff > External Diff / Merge. Select
TortoiseMergein both dropdown lists.
OKand point SourceTree to your location of
After that, you can select
Resolve Conflicts > Launch External Merge Tool from context menu on each conflicted file in your local repository. This will open up TortoiseMerge, where you can easily deal with all the conflicts, you have. Once finished, simply close TortoiseMerge (you don't even need to save changes, this will probably be done automatically) and after few seconds SourceTree should handle that gracefully.
The only problem is, that it automatically creates backup copy, even though proper option is unchecked.
There is an alternate solution to this problem, which uses KDiff3 instead of TortoiseDiff / TortoiseMerge.
Source of this article: Stack Overflow.