git status 显示如下
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: vendor/common/vpu/lib/libmpp2/Android.bp
new file: vendor/common/vpu/lib/libmpp2/arm/mpp_dev/libmpp.so
new file: vendor/common/vpu/lib/libmpp2/arm/mpp_svp/libmpp.so
new file: vendor/common/vpu/lib/libmpp2/arm64/mpp_dev/libmpp.so
new file: vendor/common/vpu/lib/libmpp2/arm64/mpp_svp/libmpp.so
git pull 合并报错
error: Your local changes to the following files would be overwritten by merge:
code/vendor//common/vpu/lib/libmpp2/Android.bp
Please commit your changes or stash them before you merge.
解决
git reset [文件]
#或者
git rest [目录]
注意:1. 命令只是将该文件移出暂存区(即取消 add 操作),并不会删除该文件。