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
I understand you want to trash your local changes and pull down what's on your remote?
If all else fails, and if you're (quite understandably) scared of "reset", the simplest thing is just to clone origin into a new directory and trash your old one.