CODEWITHSUNDEEP
atlassian-sourcetreemergetoolfilemerge
Rohit Ranjan Pandey
Rohit Ranjan Pandey

Reputation: 491

Source tree is not launching External merge tool when I choose to resolve conflict using external merge tool

Source tree is not launching external merge tool for few files with extension .java . Source tree is showing conflicts in few files. When I select resolve conflict -> Launch external merge tool, it just shows a popup for less then one second and dismiss. Instead of opening the tool it generates and shows 4 backup files below conflicted file in source tree. I have checked .gitconfig too and it shows correct path there mapped to opendiff which opens FileMerge by default in Mac.

Upvotes: 1

Views: 6406

Answers (3)

Abishak R
Abishak R

Reputation: 17

In Xcode go to preferences >> locations >> Command line tools >> choose one xcode

Upvotes: 2

Pritam Patil
Pritam Patil

Reputation: 109

This may happen due to Sourcetree couldn't fine '.gitconfig' file location. Even if you keep 'Allow Sourcetree to modify your global Git config files' check box ticked. it may not be updated.

Try adding, HOME in your system environment variables to the path of your '.gitconfig' file location. For e.g. HOME C:\Users\XXX

Upvotes: 2

Rohit Ranjan Pandey
Rohit Ranjan Pandey

Reputation: 491

I figured it out. I am trying this on mac and having Xcode. It was not showing anything under command line tools. I installed command line tools and mapped under Xcode. Also changed the diff to FileMerge in Sourcetree preferences. And now i am getting my External merge tool launched.

Upvotes: 1

Related Questions