Part 6: Working with Git - Resolving Merge Conflicts

Ariel Rokem

(Stanford University)

Play Video

Duration: 7:18


Part 6 in the Version Control with Git series. This tutorial covers what to do in order to remain sane when a merge conflict occurs. Ariel will keep you cool and relaxed as he navigates you through this tricky gituation.

Created: Thursday, March 27th, 2014