Updating oh-my-zsh when git config user.name is not set causes things to be out of whack

[cjcjameson]

Our workstation was such that we had set the git config --global user.name, installed the Zotfiles, un-set the git config, and then when we opened a new terminal, we were prompted to update oh-my-zsh. The terminal output showed a git clone that worked, but then failed on what looked like trying to write a merge commit or something. We ended up with our local master branch stranded, and our HEAD at the tip of the remote's master.

We were expecting our local commits from these fine Zotfiles to be rebased back on top of any updates to oh-my-zsh