From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 20 Oct 2005 14:24:42 GMT
Subject: Re: rsync update appears broken now
Message-ID: <81b0412b0510200724h76dc8457tb5320a644a5ef260@mail.gmail.com>
In-Reply-To: <86ek6g9t0a.fsf@blue.stonehenge.com>

On 20 Oct 2005 07:12:53 -0700, Randal L. Schwartz <merlyn@stonehenge.com> wrote:
> Alex> Absolutely normal pull into a changed repository. Just fix the
> Alex> conflict (in fetch-pack.c, look for >>>), git-update-index the file
> Alex> and commit. Doesn't look like a problem at all.
>
> What do you mean "changed repository"?  This is my git image, and I'm
> not working on git.  I made no changes.
>
> Thus, something broken?
>

Not necessarily (I see this every morning, but I know precisely I
touched the sources).
Maybe local damage? What does git-status show?