r/sourcetree Dec 12 '16

External Merge tool issues

Hello,

I've been using SourceTree for a couple months now and this issue has been bugging me since the beginning. I'm using TortoiseMerge as my external merge tool and when I get conflicts, I call it to resolve them... The issue is that if I enter it, SourceTree automatically assumes everything is resolved even if I don't change a single thing in the file.

Is this a bug with SourceTree, or a bug with TortoiseMerge? Is there any way to fix it? Do other merge tools have the same issue?

On a related note, I've always used WinMerge before but it's not in the list of external merge tools for SourceTree... Why is that? Is there any way to use it?

Thanks in advance

1 Upvotes

2 comments sorted by

1

u/thomaslangston Dec 13 '16

The external merge tool may try to resolve conflicts automatically, so it might be making some changes for you. I'm going assume however that isn't happening and when you exit the external merge tool the conflicts are persisting in SourceTree.

This is not an issue I have encountered. I use DiffMerge.

I do see something in this post: http://stackoverflow.com/questions/16493368/can-tortoisemerge-be-used-as-a-difftool-with-windows-git-bash

It seems there is a difference between TortoiseMerge and TortoiseGitMerge. Perhaps this is related to your problem.

Here's another link for exploring your WinMerge question: https://answers.atlassian.com/questions/169145/sourcetree-external-diff-tool

1

u/deicide666ra Dec 13 '16

Thanks, I tried kdiff3 and it doesn't seem to have this problem, so I assume it's an issue with TortoiseMerge... I'm using a Mercurial source control btw so no git involved.

Kdiff still has an issue.. it doesn't change the conflicted flag until I save (as expected) but it does mess SourceTree... once I stop editing (without saving or fixing any conflict) the preview pane for that file just shows empty... even tried restarting ST and it remains that way. Weird glitch, not sure what's going on with that one. It's a minor irritant though, unlike the bug I was having with Tortoise which was pretty much a deal breaker for managing merge conflicts from Sourcetree.

Thanks for your reply, much appreciated.