It was a pull from upstream to update that did it, when I noticed I decided not to do a forced push cleanup because, well, it's risky for a public repository. But I'm not sure why the pull didn't just fast forward, I suspect something is off in my local branch. I'll just delete it and co again from upstream.

Chuck