Mastering Git - Part 2: Merge Conflicts | Ray Wenderlich

In the Beginning Git video series, you discovered how powerful the branch-and-merge paradigm is. But merging isn't always as simple as it might first appear. In this video you will learn how to handle merge conflicts—which occur when Git cannot work out how to automatically combine changes.

This is a companion discussion topic for the original entry at

can you post a gist with your .vimrc?

Hi @spaceghost87

There is nothing special in my .vimrc at all—in fact I’m using stock vim from macOS, with .vimrc just enabling syntax highlighting.

My shell is a little more customised, but still not a huge amount.