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

ardua

更新 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

sunlh

busybee 发表于 2015-7-14 08:50
新建一目录，cd 进入再按 wiki 上的步骤来。

版主您好,
       小的正是如此做的, 沒想到還是遭遇了上面提到的錯誤~~

busybee

新建一目录，cd 进入再按 wiki 上的步骤来。

zhansb

Please, commit your changes or stash them before you can merge.

git 有提示怎么操作了

sunlh

我也遭遇相同問題, 根據提示進行 git stash 操作後, 再進行 git pull bitbucket pad:pad 操作, 依然還是報錯!
我是依據 wiki 上的步驟進行的:

tar xf /path/to/firefly-rk3288_pad_android4.4_git_20141218.tar.gz
git reset --hard
git remote add bitbucket https://bitbucket.org/T-Firefly/firefly-rk3288.git
git pull bitbucket pad:pad

求具體解法!!

zhansb

报什么错误

sunlh

error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        RKDocs/Develop reference documents/RockChip_Uboot开发文档V1.0.pdf
        RKDocs/Platform support lists/RKeMMCSupportList Ver1.13_2014_06_15.pdf
        bootable/recovery/install.cpp
        bootable/recovery/recovery.cpp
        bootable/recovery/rkimage.cpp
        bootable/recovery/rkupdate/Upgrade.h
        bootable/recovery/rkupdate/update/librkupdate.a
        bootable/recovery/roots.cpp
        bootable/recovery/updater/install.c
        device/rockchip/common/app/apk/RkVideoPlayer.apk
        device/rockchip/rk3288/system.prop
        device/rockchip/rksdk/overlay/frameworks/base/packages/SystemUI/res/layout-sw480dp/navigation_bar.xml
        device/rockchip/rksdk/system.prop
        frameworks/base/core/res/res/values/symbols.xml
        frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
        frameworks/base/services/java/com/android/server/wm/WindowManagerService.java
        hardware/rk29/camera/CameraHal/CameraHalUtil.cpp
        hardware/rk29/camera/CameraHal/CameraIspAdapter.cpp
        hardware/rk29/camera/Config/cam_board.xml
        hardware/rk29/hwcomposer_rga/Android.mk
        hardware/rk29/hwcomposer_rga/hwc_rga.cpp
        hardware/rk29/hwcomposer_rga/hwc_rga.h
        hardware/rk29/hwcomposer_rga/hwcomposer.map
        hardware/rk29/hwcomposer_rga/rga_angle.h
        hardware/rk29/hwcomposer_rga/rga_api.cpp
        hardware/rk29/hwcomposer_rga/rk_hwcomposer.cpp
        hardware/rk29/hwcomposer_rga/rk_hwcomposer.h
        hardware/rk29/hwcomposer_rga/rk_hwcomposer_blit.cpp
        hardware/rk29/hwcomposer_rga/rk_hwcomposer_buffer.cpp
        hardware/rk29/hwcomposer_rga/rk_hwcomposer_hdmi.cpp
        hardware/rk29/hwcomposer_rga/rk_hwcomposer_hdmi.h
        kernel/arch/arm/boot/dts/firefly-rk3288.dts
        kernel/arch/arm/boot/dts/rk3288.dtsi
        kernel/drivers/input/touchscreen/Kconfig
        kernel/drivers/input/touchscreen/Makefile
        kernel/drivers/media/video/rk_camsys/camsys_drv.c
        kernel/drivers/usb/core/hub.c
        kernel/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
        kernel/drivers/video/rockchip/rk_fb.c
        kernel/drivers/video/rockchip/screen/lcd_mipi.c
        kernel/drivers/video/rockchip/transmitter/mipi_dsi.h
        kernel/sound/soc/codecs/es8323.c
        mkimage.sh
        packages/apps/Camera2/res/values/arrays.xml
        packages/apps/Camera2/src/com/android/camera/PhotoModule.java
        packages/apps/Settings/res/values-zh-rCN/strings.xml
        packages/apps/Settings/res/values/strings.xml
Please, commit your changes or stash them before you can merge.
Aborting

duoduo

用git status查看一下，修改过哪些文件

sunlh

謝謝您的建議, 我再試試
我新買了 Firefly R3288 在 Host PC 上全新安裝了 Ubuntu 14.04 64bit 版, 安裝了 git 套件後
依據 wiki 上的步驟:
tar xf /path/to/firefly-rk3288_pad_android4.4_git_20141218.tar.gz
git reset --hard
git remote add bitbucket https://bitbucket.org/T-Firefly/firefly-rk3288.git
git pull bitbucket pad:pad

想要把 firefly-rk3288_pad_android4.4_git_20141218.tar.gz 更新如此而已!  

busybee

那真的奇怪了，你的 git 是什么版本？

$ git --version

列一下