How do I ignore an error: your local changes to the following files would be overwritten by merge?

Question

How do I ignore the following error message on Git pull?

Your local changes to the following files would be overwritten by merge

What if I want to overwrite them?

I've tried things like git pull -f, but nothing works.

To be clear, I only want to overwrite specific changes, not everything.

Answer 1

Here are two solutions: 

$ git checkout HEAD^ file/to/overwrite

$ git pull

For more commands like this please go through the following tutorial that will help you understand the git