I'm trying to revert my changes in a single file in my feature branch and I want this file to be the same as in master.
I tried:
git checkout -- filename
git checkout filename
git checkout HEAD -- filename
It seems that none of these made any changes to my feature branch. Any suggestions?
This question is related to
git
If you want to revert the file to its state in master:
git checkout origin/master [filename]
you are almost there; you just need to give the reference to master; since you want to get the file from the master branch:
git checkout master -- filename
Note that the differences will be cached; so if you want to see the differences you obtained; use
git diff --cached
Source: Stackoverflow.com