On Wed, 15 Oct 2008 13:23:50 -0700 (PDT) Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > > On Wed, 15 Oct 2008, Linus Torvalds wrote: > > > > - a merge goes south with a data conflict, and since it's all automated, > > you just want to throw it away. > > Actually, with your filename, I suspect the conflict would be not a real > file content, but more of a "delete" conflicting with a modification to > that file. IOW, I'm guessing that the thing you hit with > arch/x86/kernel/apic.c was that some branch you pulled: > > - created that file > > - deleted arch/x86/kernel/apic_[32|64].c > > - the old file got marked as a rename source for the new apic.c and > there was a data conflict when trying to apply the changes. > > as a result, your working tree would have that "apic.c" file in it, but > with conflict markers, and marked as unmerged. That sounds likely. I suspect things were especially bad today because I accidentally pulled four-week-old linux-next, which had over 500 rejects in it. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
