久しぶりにMacでzshを起動したところ何やらエラーが発生。
Last login: Fri Apr 30 13:59:52 on ttys005 [oh-my-zsh] Would you like to update? [Y/n] y Updating Oh My Zsh error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. There was an error updating. Try again later? /Users/tworks55/.oh-my-zsh/themes/agnoster.zsh-theme:91: parse error near `<<<' tworks55@macV2J ~ %
Trouble Updating oh-my-zsh · Issue #9170 · ohmyzsh/ohmyzsh · GitHub
を参考に解決することができました。
まず、以下のの3ステップを実行します。
cd $ZSH/ git pull git reset --hard HEAD~1
そして、再度Shellを起動する。もしくは以下のコマンドでもUpdate可能です。
omg update
アップデートするか聞かれるのでYesとすると更新されます。
以下が履歴になります。
tworks55@macV2J ~ % cd $ZSH/ tworks55@macV2J .oh-my-zsh % git reset --hard HEAD~1 HEAD is now at 615f9dd chore: direct support queries to Discussions tworks55@macV2J .oh-my-zsh % git pull remote: Enumerating objects: 111, done. remote: Counting objects: 100% (111/111), done. remote: Compressing objects: 100% (39/39), done. remote: Total 88 (delta 56), reused 79 (delta 48), pack-reused 0 Unpacking objects: 100% (88/88), 18.51 KiB | 239.00 KiB/s, done. From https://github.com/ohmyzsh/ohmyzsh 3f50482..63a7422 master -> origin/master Updating 615f9dd..63a7422 Fast-forward README.md | 2 +- plugins/archlinux/README.md | 35 ++++---- plugins/archlinux/archlinux.plugin.zsh | 19 ++-- plugins/command-not-found/README.md | 1 + .../command-not-found/command-not-found.plugin.zsh | 100 +++++++++++---------- plugins/deno/.gitignore | 1 + plugins/deno/README.md | 18 ++++ plugins/deno/deno.plugin.zsh | 23 +++++ plugins/fzf/fzf.plugin.zsh | 1 + plugins/kubectl/README.md | 2 +- plugins/kubectl/kubectl.plugin.zsh | 2 +- plugins/npm/README.md | 4 + plugins/npm/npm.plugin.zsh | 12 +++ plugins/rails/README.md | 4 +- plugins/react-native/react-native.plugin.zsh | 3 + plugins/systemadmin/systemadmin.plugin.zsh | 3 +- themes/gentoo.zsh-theme | 2 +- themes/ys.zsh-theme | 20 ++++- 18 files changed, 164 insertions(+), 88 deletions(-) create mode 100644 plugins/deno/.gitignore create mode 100644 plugins/deno/README.md create mode 100644 plugins/deno/deno.plugin.zsh
再度zshを起動。
Last login: Sun May 2 21:37:33 on ttys000 [oh-my-zsh] Would you like to update? [Y/n] y Updating Oh My Zsh From https://github.com/ohmyzsh/ohmyzsh * branch master -> FETCH_HEAD Current branch master is up to date. __ __ ____ / /_ ____ ___ __ __ ____ _____/ /_ / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ / /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / \____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ /____/ Oh My Zsh is already at the latest version. To keep up with the latest news and updates, follow us on Twitter: https://twitter.com/ohmyzsh Want to get involved in the community? Join our Discord: https://discord.gg/ohmyzsh Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh
