Using Git

Removing/undoing your changes to a file

 git checkout -- <path>

If "path" is ".", you undo all your changes to version controlled files:

 git checkout -- .

Merge conflict: Throw away local changes

 git checkout master <path>
 git commit
 git merge master

(The last command should now do nothing, just say you're fully merged.)