pkgs --upgrade 报错

发布于 2020-05-21 13:45:34 浏览：1284 订阅该版

```defaultuser0@DESKTOP-S5UC2VL I:\LEAR\RTT t-thread\bsp\stm32\stm32l476-st-nucleo
> pkgs --upgrade
Begin to upgrade env packages.
From https://gitee.com/RT-Thread-Mirror/packages
 * branch            HEAD       -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
        ci.py
        iot/Kconfig
        iot/WiFi/rw007/package.json
        iot/WiFi/wlan_wiced/package.json
        iot/at_device/Kconfig
        iot/at_device/package.json
        iot/freemodbus/Kconfig
        iot/iot_cloud/Kconfig
        iot/iot_cloud/tencent-iothub/Kconfig
        iot/iot_cloud/tencent-iothub/package.json
        iot/ppp_device/Kconfig
        iot/ppp_device/package.json
        iot/webclient/Kconfig
        iot/webclient/package.json
        language/micropython/Kconfig
        language/micropython/package.json
        misc/fastlz/package.json
        misc/quicklz/package.json
        multimedia/mupdf/package.json
        peripherals/Kconfig
        peripherals/as608/Kconfig
        peripherals/as608/package.json
        peripherals/i2c_tools/Kconfig
        peripherals/i2c_tools/package.json
        peripherals/nrf24l01/Kconfig
        peripherals/nrf24l01/package.json
        peripherals/sensors/Kconfig
        peripherals/sensors/aht10/package.json
        peripherals/sensors/ap3216c/package.json
        peripherals/sensors/dht11/package.json
        peripherals/sht2x/package.json
        system/Kconfig
        system/fal/package.json
        system/littlefs/Kconfig
        system/littlefs/package.json
        system/minIni/package.json
        system/rt_robot/Kconfig
        system/rt_robot/package.json
        system/rti/package.json
        tools/Chinese_font_library/Kconfig
        tools/Chinese_font_library/package.json
        tools/CmBacktrace/Kconfig
        tools/CmBacktrace/package.json
        tools/EasyFlash/Kconfig
        tools/EasyFlash/package.json
        tools/Kconfig
        tools/nr_micro_shell/Kconfig
        tools/ulog_easyflash/package.json
Please commit your changes or stash them before you merge.
Aborting
==============================>  Env packages upgrade done

Begin to upgrade env scripts.
From https://gitee.com/RT-Thread-Mirror/env
 * branch            HEAD       -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
        cmds/cmd_package.py
        env.py
        init_env.py
        kconfig.py
Please commit your changes or stash them before you merge.
Aborting
==============================>  Env scripts upgrade done
```env1.1.2