search

Home >Backend Development >PHP Tutorial >composer update 之后 无法 git pull 了

composer update 之后 无法 git pull 了

WBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWB
WBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOYWBOriginal
2016-06-06 20:31:261613browse

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

<code>[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]#

</code>

回复内容：

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

<code>[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]#

</code>

要先commit吧

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

一般的解决方式是

<code>1. git stash

2. git pull origin master

3. git stash pop
</code>
Statement：
The content of this article is voluntarily contributed by netizens, and the copyright belongs to the original author. This site does not assume corresponding legal responsibility. If you find any content suspected of plagiarism or infringement, please contact admin@php.cn
Previous article：地图信息后台验证Next article：全文索索 - PHP 站内搜索，mysql 是否该加 FULLTEXT ，效率与LIKE相比如何

Related articles

See more