How to practice not freaking out when you see (master|MERGING) by using git merge –abort – 102 – Sara Ford's Blog
Strategies and Tools for Resolving Git Merge Conflicts | Savas Labs
Merge Conflicts: What They Are and How to Deal with Them | CSS-Tricks - CSS-Tricks
Tower on Twitter: "💡Merge Conflicts💡 [9/10] Afraid of messing things up? You can always undo a merge conflict, return to a clean state, and start over. Some commands, like "git merge" and "