Git for R users: how to resolve a merge conflict

Stay calm! The dreaded git merge conflict isn't really that big a deal. Let me show you how to handle it. If this vid helps you, please help me a tiny bit by mashing that 'like' button. For more #rstats joy, crush that 'subscribe' button!