>> Or you could spend an hour or so learning to use git This is such nonsense. The git you can learn in an hour gets you exactly to the point where you end up

>> Or you could spend an hour or so learning to use git This is such nonsense. The git you can learn in an hour gets you exactly to the point where you end up in this "now what?" situation. Furthermore unless you're working through this more regularly than every 6+ months you're not going to remember how to fix it.