Re: real git pull grief

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 16, 2013, 00:20 UTC
Message-ID: <20130116002046.GF12524@google.com>
In-Reply-To: <CADq_mb8LwzbjvaXGCR-6TZbTShf2nzw5wtNZ66_XmOM00-=xzQ@mail.gmail.com>

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