error: you need to resolve your current index first plugins/macos/spotify: needs merge

error: you need to resolve your current index first plugins/macos/spotify: needs merge

我正在尝试卸载 zsh 插件 (macos),我修改了 .zshrc 文件并从 plugin 列表中删除了 macos,并删除了macos 路径 ~/.oh-my-zsh/plugins 中的文件,但现在每当我初始化 zsh 时,总是会出现以下错误。我该如何解决这个问题?

error: you need to resolve your current index first plugins/macos/spotify: needs merge

只需重置它:

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