How to resolve merge conflicts with git
Dealing with messy merge conflicts can be a bit like navigating heavy traffic. With a bit of patience...
Tags: git, github, terminal, thecollablab