I'm having problems getting SourceTree to launch Filemerge from either of the two menu options.
I see the "visual merge" dialogue box appear, and BACKUP, BASE and REMOTE files appear in the working tree. Then after about 5 seconds the dialogue box closes itself, but Filemerge doesn't launch.
Clicking the "External diff" button at top right does launch Filemerge - with 'null - /dev' in the left-hand pane, and the conflicted file in the right.
My Xcode path is /Applications/Xcode.app/Contents/Developer. Running opendiff at the command line works with no problem.
I've tried setting the preferences settings as both 'FileMerge' (with no diff command, and empty arguments) and as 'Other' with the diff command as 'opendiff' and arguments as $LOCAL $REMOTE -merge $MERGED (as per http://www.soycow.org/meep/?p=1170.
(Edited to add: this is the content of my global .gitconfig:
tool = default-difftool
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \$
trustExitCode = true
Does anyone have any ideas?
I am seeing the exact same issue, but my external diff/merge tool is Araxis Merge. Everything was working fine through multiple individual 3-way merges. Then, without any reason I can see, Sourcetree started acting as described above. It creates the merge files in the folder, a dialog flashes up (but goes away too quickly to read) and nothing else happens.
Does anyone have an aswer for this? It is very frustrating.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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