On Tue, Jan 15, 2013 at 04:07:54PM -0800, JavaSrvcs wrote:
> 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: ..../Some.java*
> <many lines like the above>

It seems to be a filesystem issue. Sometimes there is a change at filesystem
permissions level, not at the files content level. So, check that, and do
a `git checkout` for all of them if you want to keep its previous mode.



Reply via email to