I\'m using Git 1.7.4.1. I want to get the latest version of my code from the repository, but I\'m getting errors ...
$ git pull …. M selenium/ant/build.proper
If you just want to throw away everything in your working folder (eg the results of a failed or aborted merge) and revert to a clean previous commit, do a git reset --hard.
git reset --hard