[git-users] Re: git grief

[Blind]

I suppose its a system difference issue

try:

git config core.filemode false


and then git status again


16 януари 2013, сряда, 02:07:54 UTC+2, JavaSrvcs написа:
>
> 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*
> 
>
>
> 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.
>

-- 

[git-users] Re: git grief

[Thomas Ferris Nicolaisen]

On Wednesday, January 16, 2013 1:07:54 AM UTC+1, 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*
> 
>
>
> 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?
>

One way I can imagine it happening: You first cloned using one 
configuration/version of Git, and then later on pulled using another 
configuration/version. The first configuration was set to convert line 
endings , while 
the second one wasn't (or the other way around).

However, this is merely guessing. You can tell if it's a EOL issue by doing 
a "git diff", and see if the changes are line-ending changes only.

In order for us to give a proper answer, please provide us with the 
following:

* Operating system (specifically which version)
* Git version (git --version), and an overview of any recent changes you 
have made
* Git configuration (system, home, repository), and an overview of any 
recent changes you have made
* Some of of that "git diff" output you are getting

--