当前位置:Gxlcms > PHP教程 > composerupdate之后无法gitpull了

composerupdate之后无法gitpull了

时间:2021-07-01 10:21:17 帮助过:51人阅读

使用git 取代FTP上传源码,yii2的框架,然后在服务器上升级 yii2 vendor目录,使用 composer updategit 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]#

回复内容:

使用git 取代FTP上传源码,yii2的框架,然后在服务器上升级 yii2 vendor目录,使用 composer updategit 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]#

要先commit吧

问题原因是你git远程仓库上有提交和你本地有相同修改的文件。

一般的解决方式是

1. git stash

2. git pull origin master

3. git stash pop

人气教程排行