[Solved] Upgrading Oh My Zsh: Cannot pull with rebase

I’m a big fan of oh my zsh, but recently I had a small problem upgrading it. The error message I got indicated that I had a changed file that couldn’t be overwritten automatically. My suspicion is that I installed some docker autocomplete plugin that I somehow didn’t install quite correctly.

Updating Oh My Zsh
error: Cannot pull with rebase: You have unstaged changes.
There was an error updating. Try again later?

The key to solving the failed upgrade is to find your .oh-my-zsh directory.

On Mac OS mine is located at /Users/jonathan/.oh-my-zsh, on Linux it’s at /home/jonathan/.oh-my-zsh.

keep oh my zsh changes

To keep the changes that you’ve made to your .oh-my-zsh diretory and upgrade, just run the following commands:

cd ~/.oh-my-zsh
git stash
upgrade_oh_my_zsh
git stash apply

discard oh my zsh changes

To discard the changes that you’ve made to your .oh-my-zsh diretory and upgrade anyways ,just run the following commands:

cd ~/.oh-my-zsh
git reset --hard
upgrade_oh_my_zsh

PS: If you’re using zsh or oh my zsh, try my absolutely favourite theme: wezm.

Leave a Reply

Your email address will not be published. Required fields are marked *