One of the more frustrating aspects of git, especially for beginners working on large projects, is git’s penchant for cryptic messages about merge conflicts. This concept map shows how I conceptualize dealing with them. Based on http://software-carpentry.org/v5/novice/git/03-conflict.html