Apparently this isn't fixed. I discovered it again and after discussion on the git mailing list, it seems related to me rsyncing my tree between multiple machines.
Affected: 1.5.6.3-1.1ubuntu2, git version 1.6.0.4 shipped with 9.04 Not affected: 1.5.4.3-1ubuntu2, git version 1.6.4 from upstream, 1.6.3.3-2~ppa1~intrepid -- '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 ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
