hey @elliotwoods , next time this happens could you post the output of
git remote -v
git branch -a
? i'm thinking two possibilities, you have a branch named upstream/opencv2.3 (ie the '/' is part of the branch name), which is confusing git; or you have something fishy going on with your upstream remote.