Git pull error: Your local changes to the following files would be overwritten by merge:

Question

I am trying to pull changes from remote branch but getting an error which doesn\'t make sense

when I do

git pull

I get back

<

Answer 1

Had the same issue. Solved it by re-cloning the repo. But now I think that the reason was the line endings in these files. I played with them before.

I suppose that line-ending difference doesn't mark files as changed, but may lead to this message. When you rm the files and recheckout them, line endings should set to "good state", and pull goes fine.