Using Meld merging tool on Mac
brew tap homebrew/cask brew cask install meld
- If meld doesn't start while executing from terminal, try this:
/usr/local/Caskroom/meld/3.19.2-r6,osx-15/meld.wrapper.sh script installed by brew to the following
#!/bin/sh rm -rf ~/Library/Saved\ Application\ State/org.gnome.meld.savedState exec '/Applications/Meld.app/Contents/MacOS/Meld' "$@"
If you want to install Meld without
brew go to: https://yousseb.github.io/meld/ , this might have a newer version, but the package installed using
brew actually comes from this project.
Legacy method (old osx versions)
Install meld with brew
brew install meld
brew info pygtk
Paste result of (3) in ~/.bashrc or ~/.zshrc
Set meld as your default git mergetool
git config --global merge.tool meld
Go find your conflicts!