Merge Conflicts in Git and Github: Git and Github Tutorial Series (Video 11) Published -- Download video MP4 360p