real git pull grief

From: Jay Vee <jvsrvcs@gmail.com>
Date: Jan 16, 2013, 00:17 UTC
Message-ID: <CADq_mb8LwzbjvaXGCR-6TZbTShf2nzw5wtNZ66_XmOM00-=xzQ@mail.gmail.com>

I have not changed any code and just tried to do a git pull and get the following message:

Updating 527f1ee..18cf73e
error: Your local changes to the following files would be overwritten by merge:
        java/..../Info.java
Please, commit your changes or stash them before you can merge.
Aborting
----------

I HAVE NOT CHANGED THIS FILE. It is telling me that my local changes.... huh? I have not changed or modified the file.

---- When I do a $git status I see a lot of other files that begin with:

# modified: .... <many of these>

How do I get out of this mess? I do not want to reset head. I want to get back to the state where it does not think I have modified a specific set of files... namely the files that I did not change.

How did I get into this state? How do I prevent from getting into this state in the future? How do I get out of this state now?

thanks for all the help.

J.V.