Until recently, I relied on Araxis Merge als external diff/merge tool. Now nothing happens any more when i launch the command. When I launch it as conflict resolution tool, the window that tells me I have to quit the merge tool after merging disappears right away after showing up.
It could be that this is since the 1.5.4 update, but I'm not sure if it had worked afterwards for some time or not.
I already switched preferences to FileMerge and back. FileMerge works, Araxis Merge doesn't react.
The Araxis Merge command line utilities are in /opt/local/bin which is in my $PATH, and those work fine when invoked from the shell.
version：1.6.0b1 , I have the same problem. Nothing happends when I click "external diff" button.
Visual Diff Tool: Other
Diff Command: compare
Arguments: $REMOTE $LOCAL
And I can run command blow in terminal.
compare ./cleanhis.sh ./cleanhis2.sh
I use Araxis Merge 2012. (Have path :/Applications/Araxis Merge.app/Contents/Utilities, and I copy "compare" file to path "/usr/bin/". So "Visual Diff Tool" can be set to "Araxis Merge", otherwise it's forbidden.)
In my case, nothing happends when I click "external diff" button, with select "File Merge". And then I turn off "Allow SourceTree to modify your global Mercurial and Git configuration files" option, the File Merge window can show.
Hi Malik / Ye,
There was two things here. One was a non-repro in 1.5.8 that got fixed for 1.6, and the other was that Araxis have moved their compare utility to another folder in the file system which SourceTree now has to look up. Check this JIRA issue for more information.
The good news is that this is fixed in 1.6. The 1.6 beta is available, so if you use that it should fix your problem. The final will be out soon, and the beta is stable.
Just as a note, upgrading your Araxis Merge on older versions of SourceTree will cause it to break. You'd need to upgrade to 1.6.0b1+ in order for the issue to be resolved but we've only been able to test it in our local environments, and one of the devs from Araxis tested it for us and confirmed it worked. It'd be good to know if 1.6.0b1+ is broken for a user so we can get down on this one.
I'm now at Sourcetree 1.6 and Merge 2012 (simply didn't have a reason to upgrade so far), and when I configure Sourcetree to use Araxis Merge for merges, Merge will simply not start up at all. Worse, the "merge using external tool" menu is then greyed out.
I've just looked into this one again, the only reason we don't allow to select a merge/diff tool is if "Allow SourceTree to modify your global Mercurial and Git configuration files" option is turned off. As you say, this option is turned on for you and it's still not allowing you to select a tool which would mean this is a bug. I've raised an issue for you here so we'll follow up from there here on out.
We're really sorry about this, it's the last thing we want you to expect. If you could follow the issue I've linked we'll be updating details on there and perhaps requesting information to further find what the problem is.
Actually I've just gone over this with another developer. Could we get the following details?
This will help us further to determine what the problem could be.
I have same issue as Maik, and here's unusual thing:
After rather long search I found my araxis compare in "/usr/local/bin/compare2".
Possible explanation is:
I've installed imagemagick via brew recently, and it also has compare tool at "/usr/local/bin/compare". Maybe brew or something else moved it, I don't know. But araxis works great by itself, though source tree can't launch it.
After using "Other" for merge with "compare2", everything works great, except return value: Source Tree thinks Araxis wasn't launched succesfully.
Btw, before this thread I've used following merge tool options:
"Other" "open -a "Araxis Merge"" "$LOCAL $BASE $REMOTE $MERGED"
And it worked great except Source Tree couldn't recognize it's return values.
P.S. Sorry for nasty English :)
Thanks for the information Alexey. It looks like Araxis have changed their utility to be called 'compare2' rather than 'compare'. We assume it's called 'compare' which means SourceTree is calling the wrong application. I've filed an issue here on JAC which should fix the problem: https://jira.atlassian.com/browse/SRCTREE-1764
Alexey: this might be the only option. There's no real way of us telling, it seems this is a rare case of you having a 'compare' utility installed already and then installing Araxis must be creating a 'compare2' utility instead. I'm using the same build as everyone else and mine is simply 'compare'. Regardless, this is something I'll stick in the SourceTree documentation in the next version, and we may look into future workarounds. There's already issues open to help users set their diff tools more easily.
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs