使用git 取代FTP上传源码，yii2的框架，然后在服务器上升级 yii2 vendor目录，使用 composer update 再 git pull 拉取，结果无法读取了

 [root@aliyun basic]# git pull
Updating 0281143..e1025ea
error: Your local changes to the following files would be overwritten by merge:
        composer.lock
Please, commit your changes or stash them before you can merge.
Aborting
[root@aliyun basic]#