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!
For those who have problems in newer versions https://github.com/Homebrew/homebrew/issues/36824
If you try:
$ brew install meld Error: No available formula for meld Searching formulae... Searching taps...`
$ brew install homebrew/x11/meld
If you want to install Meld with no hassle go to: https://yousseb.github.io/meld/
- An actual DMG file that you can install right away.
- No X required.
- Key mapping is Mac(ish).
- Used Clearlooks + Tango icon theme in the app so that it looks nice.