On Thu, May 10, 2012 at 11:51 AM, Jeremy Postlethwaite <jpostlethwaite(a)wikimedia.org> wrote: I don't see why you'd run 'git pull origin master' after making all your changes. It sounds like it would attempt to merge origin/master into your feature branch, which you really don't want it to do (this is not an apparent problem in your example because there was nothing to pull when you ran it). If you just want to update where origin/master is, run 'git fetch'. But you're not even using that information, so you shouldn't need to do this. Roan