From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Thu, 20 Oct 2005 14:12:53 GMT
Subject: Re: rsync update appears broken now
Message-ID: <86ek6g9t0a.fsf@blue.stonehenge.com>
In-Reply-To: <81b0412b0510200608l61c00ed0yd4dbc00c313665fe@mail.gmail.com>

>>>>> "Alex" == Alex Riesen <raa.lkml@gmail.com> writes:

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?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!