Resolving Merge Conflicts

Git and GitHub for Poets Lesson #9

In this video, I look at how to resolve a “merge conflict” using the GitHub interface.