git pull - reporting that I modified files, but I did not

When I do a git pull, I am getting a messages that changes to local files would be overwritten by a merge, but I have not changed these files locally at all, I have not opened them in my IDE. This happens every now and then. 1) Why does this happen? 2) How do I prevent this from happening in the

Re: real git pull grief

git diff shows a list of files that I have made some changes to and the diff for files that I have not changed. The files I have made changes to (config files), I never want to commit or push and sometimes I may want them overwritten. for now I simply want to leave them there (changes to .sql fil