How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?

Alright with the help of the other two answers I’ve come up with a direct solution:

git checkout HEAD^ file/to/overwrite
git pull

Leave a Comment