Git Merge Conflicts: Branching, Merging & How to Resolve

Git merge conflicts feel like a failure the first time they happen, but they are Git declining to...