A screencast demonstrating the use of git and Github to manage simple changes to a project. The first set of changes work without any conflicts, and then the second set (deliberately) generate a merge conflict so we can see what that looks like.
This is actually pretty viewable at 1.5x or 2x speed.
