Using Meld merging tool on Mac
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!
$ brew install caskroom/cask/meld
brew tap homebrew/cask brew cask install meld
If you want to install Meld with no hassle go to: https://yousseb.github.io/meld/
Why Meld for Mac/OSX and not Macports/Homebrew?
- DMG file that you can install right away.
- Retina support (check the screenshot!)
- Latest 3.x series
- No hassle install (drag/drop like any other app)
- Integrates with OSX menu