(Start watching at 00:20)
After the preceding videos, you have the basic tools you need to work on a team project using git and GitHub. In this video we review the steps you will using frequently as you do this, and teach you how to fix a common problem you may encounter: merge conflicts.
