oh my zsh Cannot pull with rebase......

image.png

http://blog.51cto.com/yjw1983/1718387

升级oh_my_zsh报错：“oh my zsh Cannot pull with rebase: You have unstaged changes. Please commit or stash them. There was an error updating. Try again later?”

在github上也发现有人提过这样的issue。但解决方法都不对，最后看到一外国哥们这样解决了问题：

1. cd ~/.oh-my-zsh/
2. git add .
3. git commit -m "commit message"
4. upgrade_oh_my_zsh

我一试还真行，通过git status -s查看发现原来是增加主题后本地的master分支有变化造成的。

wKioL1Zc-TXhMhg6AAAafit0oQs961.png

commit后就ok了。

再次使用upgrade_oh_my_zsh命令升级

wKioL1Zc-YOzhR9UAAB8y1M_MZY487.png

一切ok！