pull error caused by duplicate branch names, different case

[rodnolan]

I've encountered a problem similar to this on a different repositories where there were duplicate folder names within the same branch; one folder used some uppercase letters, the other was all lower case. I tracked it down to the client I was using. More info http://code.google.com/p/tortoisegit/issues/detail?id=1573

This may or may not be related but I wonder if any of the committers are using Tortoise GIT?

I'm on 64-bit Windows 7 and the following output is from the CLI.

$ git pull origin
From https://github.com/blackberry/WebWorks-API-Docs
 = [up to date]      master     -> origin/master
error: Ref refs/remotes/origin/next-BB10 is at 60b984937c7aace31506735371880e484bdbd53f but expected 6b7d772b2688b6fc9b37338c5f55f4bf2d8600ce
 ! 6b7d772..b980255  next-BB10  -> origin/next-BB10  (unable to update local ref)
 = [up to date]      next-bb10  -> origin/next-bb10
 = [up to date]      smartphone -> origin/smartphone
 = [up to date]      tablet     -> origin/tablet

[rodnolan]

now fixed, thanks.