document resolving merge conflicts with git

[josephjclark]

Add docs which show how you can use git to resolve conflicts between a project and sandbox

I've said many times "just use git!" and can picture it in my head. But I've not done it myself directly, and would like a step by step guide to show the feel of it.