Vim mergetool – Reimagined Git merge workflow (github.com)

This is very intuitive once you've used it a couple of times. I have handled conflicts that others were hesitant to touch with this.