Try stashing any "changes" prior to the git pull, to prevent nuisance breakage.