Skip to content

Instantly share code, notes, and snippets.

View milanboers's full-sized avatar
🙃

Milan Boers milanboers

🙃
58 followers · 35 following
View GitHub Profile
@ffittschen
ffittschen / gitconfig.md
Last active October 23, 2025 07:09
Use IntelliJ or WebStorm as git mergetool with SourceTree

Use IntelliJ or WebStorm as git mergetool

Configure Sourcetree

The merge tool that ships with JetBrain's IntelliJ IDEA or WebStorm is really awesome and way better than FileMerge. It is quite simple to configure SourceTree to use it as the default mergetool:

  1. Open the SourceTree preferences and select the Diff tab
  2. Choose Custom both as Visual Diff Tool and as Merge Tool
  3. Paste the following commands into the textfields:
  • Diff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff