tvaughan/middleman-deploy — pull request #10 by benben (2013-01-02 21:41:44+00:00)
Title: git: remove origin fetching, fixes #9

Ok, I tried it and can reproduce this error.
I think, I added this for keeping remote (unpulled) changes of your co-worker or someone else for example, but its obviously not working.

I removed this part for now. That means, the user is responsible if he's not pulling before changing anything and therefore could probably remove other's changes from the remote repo. He will at least get an error if he is trying to push to their page's source repo, needs to merge and deploy again, with all changes.

:sparkling_heart: Thanks for reporting :pizza: :beers: