upgrade_oh_my_zsh not working

All of the sudden I encountered the following error while upgrading my zsh

upgrade_oh_my_zsh
Upgrading Oh My Zsh
From https://github.com/robbyrussell/oh-my-zsh
 * branch            master     -> FETCH_HEAD

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)

and all you need to do is cd to your oh-my-zsh/tools and edit upgrade.sh from

if git pull --rebase --stat origin master

to

if git pull --stat origin master
Advertisements