Last Updated: February 25, 2016
·
1.569K
· silvercorp

Ignoring “Your local changes to the following files would be overwritten by merge” on pull

git checkout HEAD^ file/to/overwrite
git pull