This issue is now resolved. I had to issue the command git checkout master before the standard upgrade process would work again.