Found the problem. Apparently git had some "unstaged changes," which I got past by running sudo hit stash. Weird, but now I seem to have upgraded successfully.