Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Resolve Conflicts with external tool is not working.

When I click resolve using external merge tool it is not opening anything. I have tried DiffMerge and FileMerge neither work. I need to be able to resolve confilcts from sourcetree.

5 answers

The issue is actually that the 'opendiff' command is how FileMerge is invoked by git/hg and with the App Store version of XCode on a clean machine this may not be on your path.

This Knowledge Base article should hopefully help you resolve this problem: http://confluence.atlassian.com/pages/viewpage.action?pageId=267258218

This works fine for me, please provide some specifics:

  1. Mercurial or Git
  2. Type of file
  3. SourceTree version
  4. Location of your FileMerge and DiffMerge binaries

Does 'hg resolve' or 'git mergetool' work on the command line?

Hi,

I Have the same problem. i try to resolve some conflicts with external merge tool and the merge tools never open.

- I'm using git

- it's a .m from and XCode project. (Objective-c)

- version of sourceTree is 1.3.3

It seems that it appear since the new XCode 4.3 and since all the Developers Tools are now in the XCode package. I found File merge : /Applications/Xcode.app/Contents/Applications

And i don't see any settings in sourceTree to set the directory of file merge.

Thanks in advance for your help.

Tanks you for your answer

I added some informations to the article you pointed to me.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

4,367 views 4 8
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you