I think I've figured out the issue and it's not specific to GitHub at all. When I push a bookmark to the remote repo it doesn't immediately get it's git-remote tag updated. That doesn't happen until my next pull. If I happen to pull before the branch is merged, everything works fine. If not, it gets treated as if it diverged.