Firefly开源社区

打印 上一主题 下一主题

GIT 失败,请问各位怎样解决

2

积分

0

威望

0

贡献

游客

积分
2

GIT 失败,请问各位怎样解决

发表于 2015-2-28 16:07:23      浏览:15943 | 回复:18        打印     [复制链接] 楼主
更新 79052af..45fb49a
error: Your local changes to the following files would be overwritten by merge:
        FFTools/AndroidTool_Release_v2.33.rar
        bootable/recovery/roots.h
        frameworks/base/core/java/android/view/WindowManagerPolicy.java
        frameworks/base/core/res/res/drawable-hdpi/ic_lock_power_off.png
        frameworks/base/core/res/res/drawable-ldpi/ic_lock_power_off.png
        frameworks/base/core/res/res/drawable-mdpi/ic_lock_power_off.png
        frameworks/base/core/res/res/drawable-xhdpi/ic_lock_power_off.png
        frameworks/base/core/res/res/drawable-xxhdpi/ic_lock_power_off.png
        frameworks/base/core/res/res/values-zh-rCN/strings.xml
        frameworks/base/core/res/res/values/strings.xml
        frameworks/base/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
        frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
        frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
        frameworks/base/policy/src/com/android/internal/policy/impl/GlobalActions.java
        frameworks/base/services/java/com/android/server/power/ShutdownThread.java
        kernel/arch/arm/boot/dts/lcd-b101ew05.dtsi
        kernel/arch/arm/configs/firefly-rk3288_defconfig
        kernel/drivers/input/touchscreen/rockchip_gslX680_firefly.c
        kernel/drivers/video/backlight/pwm_bl.c
        kernel/drivers/video/modedb.c
        kernel/kernel/irq/chip.c
        packages/apps/Camera2/src/com/android/camera/VideoModule.java
        packages/apps/Settings/res/values-zh-rHK/strings.xml
        packages/apps/Settings/res/values-zh-rTW/strings.xml
        packages/apps/Settings/res/xml/device_info_settings.xml
        packages/apps/Settings/res/xml/hdmi_settings.xml
        packages/apps/Settings/src/com/android/settings/DeviceInfoSettings.java
        packages/apps/Settings/src/com/android/settings/HdmiControllerActivity.java
        packages/apps/Settings/src/com/android/settings/HdmiReceiver.java
        packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
        system/core/init/devices.c
Please, commit your changes or stash them before you can merge.
Aborting
回复

使用道具 举报

您需要登录后才可以回帖 登录 | 立即注册

本版积分规则

友情链接 : 爱板网 电子发烧友论坛 云汉电子社区 粤ICP备14022046号-2
快速回复 返回顶部 返回列表