报错

1
2
3
4
5
[Oh My Zsh] Would you like to update? [Y/n]: y
Updating Oh My Zsh
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
There was an error updating. Try again later?

原因

我的主题更改没有提交

解决

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
1. cd ~/.oh-my-zsh

2. git status

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 checkout -- <file>..." to discard changes in working directory)

modified: themes/ys.zsh-theme

no changes added to commit (use "git add" and/or "git commit -a")

3. git add .

git commit -m "主题更改"

4. git stash

5. upgrade_oh_my_zsh

6. git stash pop

广告

阿里云活动云服务器低至
1核-2G-1M,1年89元,3年229。
2核-4G-3M,2年469元,3年799。
2核-8G-5M,3年899元。
新老客户都有优惠 点击查看详情/购买
腾讯云现在活动
1核 2G 1M 88一年
2核 4G 5M 3年只要998。 点击查看详情/购买