赞
踩
我是git pull 服务器上代码时候遇到:
error: Your local changes to the following files would be overwritten by merge:
device/huaqin/hq8382_tb_b1a_l/ProjectConfig.mk
Please, commit your changes or stash them before you can merge.
Aborting
先使用 git stash
然后再 git pull origin master
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。