Git pull aborts

Frequently, I'll be working on a remote and a local copy at the same time. Perhaps this is a bad overall workflow and needs to be »