Introduction
Of all the source control management systems that have ever been created, git is certainly one of them. You've probably used it, and been burned by a particularly complicated merge conflict. Resolving merge conflicts can be such a harrowing experience that I've seen the anticipatory
