There was an error updating. Try again later?

[Hifilo]

Update is failing for me.

Here is the full message:

repos ➤ omz update                                            
Updating Oh My Zsh
error: Your local changes to the following files would be overwritten by merge:
        custom/example.zsh
Please commit your changes or stash them before you merge.
Aborting
There was an error updating. Try again later?
repos ➤ zsh -f $ZSH/tools/upgrade.sh                                                              
Updating Oh My Zsh
error: Your local changes to the following files would be overwritten by merge:
        custom/example.zsh
Please commit your changes or stash them before you merge.
Aborting
There was an error updating. Try again later?

any suggestions? I would prefer not to lose all my aliases and custom settings.

[carlosala]

You can:

cd $ZSH
cp custom/example.zsh custom/my-example.zsh
git checkout main -- custom/example.zsh
omz update

[Hifilo]

Apologies for not seeing this sooner, this fixed it. Thanks.