Walk through of the lesson "conflicts" of the workshop Git Advanced. https://osulp.github.io/git-advanced/03-conflict/index.html The lesson is a modification of the official Software Carpentry "version control with Git lesson" https://swcarpentry.github.io/git-novice/. 

This video assumes that the learner has taken the Intro to Git beginner lesson https://osulp.github.io/git-beginner/. This lesson is preceeded by a lesson on collaborating in Git is also available https://media.oregonstate.edu/media/t/1_ifa4281u