oh-my-zsh - Updating error

언제가부터 OMZ 가 업데이트되지 않아서 왜 그러지? 하고 말았는데... 이제 더 이상 미룰 수 없어 해결해 보기로 했습니다.

 

오류 현상:

[oh-my-zsh] Would you like to update? [Y/n] y
Updating Oh My Zsh

error: Your local changes to the following files would be overwritten by merge:
        themes/agnoster.zsh-theme
Please commit your changes or stash them before you merge.
Aborting
There was an error updating. Try again later?
➜  ~

에러 메시지에 stash 를 보아하니 git 에서 해결해야 할 듯 합니다.

내가 뭘 수정했는지도 가물가물한데 나도 모르게 손을 댓으니 저런 메시지가 발생했을 겁니다.

그래서 원하는대로 적용해 주죠.

그런데, Stash를 먼저 하고 나서 머지를 하라는군요.

 

참고로, Stash란?

Stash는 마무리하지 않은 작업을 잠시 스택에 저장할 수 있도록 하는 명령어로 아직 완료하지 않은 일을 커밋하지 않고 나중에 다시 꺼내와 마무리할 수 있습니다.

 

1. OMG 폴더로 이동

$ cd ~/.oh-my-zsh

 

 

2. GIT 적용

1) Stash 생성 : git stash

2) Stash 목록에서 이름 확인(stash@{0}) : git stash list

3) oh-my-zsh 업데이트 : omz update

4) stash 작업 가져와서 적용하기 : git stash apply stash@{0}

5) stash 제거 : git stash drop stash@{0}

➜  .oh-my-zsh git:(master) git stash
Saved working directory and index state WIP on master: d157fc6 fix(mise): update environment when loading the plugin (#12294)
➜  .oh-my-zsh git:(master) git stash list
➜  .oh-my-zsh git:(master) omz update
Updating Oh My Zsh
master

BREAKING CHANGES:

 - 25836e2 [adb]

   The `adb` plugin has been removed in favor of the completion provided out-of-the-box by
   zsh since 4.3.14.
   ...
  - 5c532a8 [pyenv]

   `pyenv` will not be loaded at startup anymore if a virtual env if found to avoid overwriting
   the expected python version.

Features:

 - 95579e3 [1password]                Make completion loading async
 - 309129f [agnoster]                 Add `anaconda` env information (#12434)
 - fb91ca2 [amuse]                    Add whitespace before virtualenv (#12423)
 - 432596e [arduino-cli]              Add completion plugin (#12522)  
 ...
 - 3012c25 [rtx]                      Refactor: Remove deprecated `rtx` plugin in favor of `mise`
 - 0ffcc3b [toolbox]                  Style: Use oneliner to extract and quote container name
 - f91dd25 [vault]                    Refactor: Remove deprecated `vault` plugin in favor of official completion

You can see the changelog with `omz changelog`
         __                                     __
  ____  / /_     ____ ___  __  __   ____  _____/ /_
 / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
                        /____/

Hooray! Oh My Zsh has been updated!

To keep up with the latest news and updates, follow us on Twitter: @ohmyzsh
Want to get involved in the community? Join our Discord: Discord server
Get your Oh My Zsh swag at: Planet Argon Shop
➜  .oh-my-zsh git:(master) git stash apply stash@{0}
Auto-merging themes/agnoster.zsh-theme
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   themes/agnoster.zsh-theme

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        themes/bullet-train.zsh-theme

no changes added to commit (use "git add" and/or "git commit -a")
➜  .oh-my-zsh git:(master) git stash drop stash@{0}
Dropped stash@{0} (0f358deefe177006ea7a50708737013a7615e8c9)
➜  .oh-my-zsh git:(master)

 

 

수동 업데이트하기

업데이트 알림이 떴는데 No를 선택해 놓구선 '아뿔싸' 하시는 경우 있으시죠? 저도 그렇습니다.

그럴 때는 당황하지 마시고 수동으로 업데이트 해 주시면 됩니다.

명령어: upgrade_oh_my_zsh

➜  .oh-my-zsh git:(main) upgrade_oh_my_zsh
Note: `upgrade_oh_my_zsh` is deprecated. Use `omz update` instead.
Updating Oh My Zsh
         __                                     __
  ____  / /_     ____ ___  __  __   ____  _____/ /_
 / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
                        /____/

Oh My Zsh is already at the latest version.

To keep up with the latest news and updates, follow us on X: @ohmyzsh
Want to get involved in the community? Join our Discord: Discord server
Get your Oh My Zsh swag at: Planet Argon Shop
➜  .oh-my-zsh git:(main)