I hit exactly the same errors running git on Mac OS X. Eventually, I figured out that the problem is that those files have capital letters in their names; I think at some point there was a kernel commit that changed them to lower case. However, the Mac filesystem is case- insensitive by default, and git gets confused. I formatted an external disk drive with the HFS+ filesystem with the case-sentivity switched *ON*, and the problem went away.
So perhaps your git tree passed through a case-insensitive filesystem at some point (e.g. FAT32 USB drive) and that is what really caused the problem. Anyway, I think this is not a bug in git, although it could be argued that it is a missing feature. 73 de W1CMC -- 'git pull' fails with "not uptodate. Cannot merge." https://bugs.launchpad.net/bugs/327739 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
