Share Facebook Twitter LinkedIn Pinterest Email Don’t watch this if you already know how to solve a merge conflict 🙂 source