Skip to content
Search

DEV Community

Cover image for How to fix - Sourcetree diff tool (FileMerge) doesn't launch on Mac
Ibrar Hussain
Ibrar Hussain

Posted on

 

How to fix - Sourcetree diff tool (FileMerge) doesn't launch on Mac

#sourcetree #filemerge #mac

On Mac, Sourcetree, by default is configured to use FileMerge that comes with Xcode for both Visual Diff Tool and Merge Tool.

In most cases when you update Xcode, it can lead to the potential issue of Sourcetree not launching FileMerge when resolving merging conflicts.

To resolve this issue, follow these steps:

  • Open Xcode

Alt Text

  • Go to preferences

Alt Text

  • Go to the Locations tab, the Command Line Tools option will be empty

Alt Text

  • Select Xcode from the dropdown list, it might prompt for the password

Alt Text

  • Enter the password and click OK button, the final result should look like this

Alt Text

  • Close Xcode and restart your merge, this time FileMerge tool will open correctly.

Top comments (0)

DEV Community

An Animated Guide to Node.js Event Loop

Node.js doesn’t stop from running other operations because of Libuv, a C++ library responsible for the event loop and asynchronously handling tasks such as network requests, DNS resolution, file system operations, data encryption, etc.

What happens under the hood when Node.js works on tasks such as database queries? We will explore it by following this piece of code step by step.

Read next

jesterxl profile image

Artificial Intelligence Literacy

Jesse Warden -

hackercabin profile image

How I hacked Crisp.chat into a less intrusive feedback widget 💻️

Simon -

ariwirasaputra profile image

Days_18 Guess the Number

Ari Wira Saputra -

jmau111 profile image

New trends in the security industry

jmau111⭐⭐ -