Emacs as git mergetool

Emacs is a really nice editor and I am always happy when i find new ways to use it. A few days ago a colleague on my project suggested i could use Emacs as a git merge tool. After some config and tweaking we got it to work. To set it up on Osx just edit the file ~/.gitconfig and add the following:

Then you can just run

when you have a merge confligt and Emacs Emerge is used!


Master the complexity in the React ecosystem!

Get an email everytime I post by signing up to the email list below.

Subscribe now and you will get a free code review checklist you can use to improve your own code.