http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull#answer-8888015
http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull#answer-8888015 recommended by tom :)