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? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Oct 21 00:25:18 2005
This archive was generated by hypermail 2.1.8 : 2005-10-21 00:25:21 EST