Favorite tool for git merge conflict resolution?

I use a primarily use a Mac for programming, and Homebrew has allowed me to easily install a lot of the Linux tools I have grown to love. I would like to know what people like to use for git merge conflict resolution. Currently I’m using the standard kdiff3 GUI, but it’s kind of confusing and I don’t feel like spending a lot of time on it if there is a slick alternative out there. I installed Beyond Compare, but I can’t quite figure out how to get git to invoke it properly.

git diff -w, git show and Sublime Text. Yeah, sorry, not what you wanted I know. :wink:

1 Like

I merge stuff by hand usually.