Git: Revert file after conflict
Suppose your file got conflicted after taking pull and want to revert changes then use below command.
git checkout HEAD my/filename.js
Reference: https://stackoverflow.com/questions/22565184/git-how-to-revert-after-a-merge-conflict-corruption