Posted by2 years ago
Archived
Hello,
SRCTREEWIN-4713 SourceTree crashes in the middle of a visual merge (Merge using external tool) Closed SRCTREEWIN-4853 Crashes after closing external merge tool. SourceTree (com.torusknot.sourcetreenotmas) is a Mac software application that has been discovered and submitted by users of Aploader. The latest version that our users have reported running on their systems is SourceTree 75. Sep 03, 2014 Side note: SourceTree has a built in list of compare tools. Would be great to contact them to add BC to it. I have seen somewhere else that someone suggested this, not sure if it was for SourceTree as well.
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?
Sourcetree For Mac How To Connect To Ssh
Sourcetree Merge Request
Thanks in advance
2 comments
Posted by2 years ago
Archived
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
Merge Tool Sourcetree Mac
2 comments