And then we resolve a merge conflict...
Since my introduction to the git workflow. I have resolved my own fair share of conflicts. Admittedly...
Tags: git, newbie, beginners