pkgs --update 命令后更新失败

发布于 2021-06-02 17:23:23 浏览：1285 订阅该版

pkgs --update  命令后出现如下错误，是什么原因，如何解决？
--------------------------------------------------
```
remote: Enumerating objects: 45, done.
remote: Counting objects: 100% (45/45), done.
remote: Compressing objects: 100% (39/39), done.
remote: Total 40 (delta 19), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (40/40), 35.70 KiB | 109.00 KiB/s, done.
From https://gitee.com/RT-Thread-Mirror/cJSON
   953e852..c4e37e9  master     -> origin/master
 * [new tag]         v1.5.9     -> v1.5.9
 * [new tag]         v1.7.14    -> v1.7.14
error: Your local changes to the following files would be overwritten by merge:
        cJSON.h
Please commit your changes or stash them before you merge.
Aborting
==============================>  cJSON update done

remote: Enumerating objects: 68, done.
remote: Counting objects: 100% (68/68), done.
remote: Compressing objects: 100% (58/58), done.
Uremote: Total 58 (delta 33), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (58/58), 18.51 KiB | 55.00 KiB/s, done.
From https://gitee.com/RT-Thread-Mirror/wiznet
   076c8ab..28692d0  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
        inc/wiz.h
        src/wiz.c
Please commit your changes or stash them before you merge.
Aborting
==============================>  wiznet update done
```