On Sat, 30 Jul 2005, Linus Torvalds wrote: > On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > OK, but note that I didn't do any editing of any local files myself. > > Both commit ids are from your public linux kernel git tree. What I did > > was equivalent to: > > > > 1. rsync from > > rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/ > > 2. waited a day or so. > > 3. git-pull-script from the same kernel.org repository. > > > > Is it expected that you end up with merge conflicts in this case? > > Nope. Something went wrong. > > > I think it should be possible to just fast forward to the new HEAD in > > this situation. > > Indeed. > > Can you send me your HEAD and MERGE_HEAD (don't do the merge).
HEAD : 33ac02aa4cef417871e128ab4a6565e751e5f3b2 MERGE_HEAD: b0825488a642cadcf39709961dde61440cb0731c -- Peter Osterlund - [EMAIL PROTECTED] http://web.telia.com/~u89404340 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
