On Mon, Oct 31, 2005 at 09:36:19AM -0800, Mark Haverkamp wrote: > > My best guess is that your merge programme is confused. I've had to > > merge the tree up several times to fix conflicts, but it's the same > > tree. It looks like whatever tool you used to merge failed to recognise > > this. > > OK, Thanks, Maybe I need to update my git tools. I recently had odd merge problems aswell. I decided to kill the tree and recheckout but I got even more odd problems. Upgrading to the latest git release helped. Wishing we'd have a mature SCM once again.. - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
