How to interactively (visually) resolve conflicts in SourceTree / git

Question

I\'m using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.

But, I\'m wondering whether there is a nice way to intera

Answer 1

From SourceTree, click on Tools->Options. Then on the "General" tab, make sure to check the box to allow SourceTree to modify your Git config files.

Then switch to the "Diff" tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I've installed KDiff3 and like it well enough. When you're done, click OK.

Now when there is a merge, you can go under Actions->Resolve Conflicts->Launch External Merge Tool.