|
楼主 |
发表于 2016-5-6 16:36
|
显示全部楼层
输入命令:
usrA@usrA-VirtualBox:/openwrt$ git pull
更新 e737bc7..1ec90b5
error: Your local changes to the following files would be overwritten by merge:
include/kernel-version.mk
package/usrAbs/openssl/Makefile
target/usrAnux/bcm53xx/patches-4.1/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch
target/usrAnux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch
target/usrAnux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
target/usrAnux/generic/patches-4.1/204-module_strip.patch
target/usrAnux/generic/patches-4.1/300-mips_expose_boot_raw.patch
target/usrAnux/generic/patches-4.1/304-mips_disable_fpu.patch
target/usrAnux/generic/patches-4.1/903-debloat_direct_io.patch
Please, commit your changes or stash them before you can merge.
Aborting
代码冲突,覆盖下:
usrA@usrA-VirtualBox:/openwrt$ git reset --hard
HEAD 现在位于 e737bc7 ramips: Drop hacky switch workaround for failsafe on rt3x5x and rt5350.
usrA@usrA-VirtualBox:/openwrt$ git pull
更新 e737bc7..1ec90b5
Fast-forward
include/kernel-version.mk | 4 ++--
package/usrAbs/openssl/Makefile | 4 ++--
.../191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch | 10 +++++-----
.../generic/patches-4.1/040-fs-overlay-fix-stacking.patch | 2 +-
.../patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch | 2 +-
target/usrAnux/generic/patches-4.1/204-module_strip.patch | 4 ++--
.../generic/patches-4.1/300-mips_expose_boot_raw.patch | 2 +-
target/usrAnux/generic/patches-4.1/304-mips_disable_fpu.patch | 2 +-
.../usrAnux/generic/patches-4.1/903-debloat_direct_io.patch | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
usrA@usrA-VirtualBox:/openwrt$ ./scripts/feeds update -a
usrA@usrA-VirtualBox:/openwrt$ ./scripts/feeds install -a
再次编译,不再报错。
|
|