threads / discuss / 32643

real git pull grief

Subject: real git pull grief

## tl;dr

3 messages between Jan 16, 2013 and Jan 16, 2013.

replies: 2people: 2as markdown or json

Jay Vee· Jan 16, 2013, 00:17 UTC · lore

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.

Jonathan Nieder· Jan 16, 2013, 00:20 UTC · re: Jay Vee · lore

Re: real git pull grief

Hi Jay,

Jay Vee wrote:

Show 8 quoted lines

> 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>

Two questions:

 * what does "git diff" say?
 * do you use Eclipse's git integration?

Curious, Jonathan

Jay Vee· Jan 16, 2013, 00:50 UTC · lore

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 files that are specific to my environment).

What I want to know is why git is reporting that changes will be overwritten to files that I have not touched or changed.

Show 5 quoted lines

>> $git diff spews a lot of information.
>
> Just a representative first 20 lines or so would be fine. :)
>
> Jonathan