Community Learn Tools Library Leisure
search
English
Home > Backend Development > PHP Tutorial > composer update 之后 无法 git pull 了

composer update 之后 无法 git pull 了

WBOY
Release： 2016-06-06 20:31:26
Original
1548 people have browsed it

使用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>
Copy after login
Copy after login

回复内容：

使用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>
Copy after login
Copy after login

要先commit吧

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

一般的解决方式是

<code>1. git stash

2. git pull origin master

3. git stash pop
</code>
Copy after login
Related labels：
composer git php
source：php.cn
Previous article：地图信息后台验证 Next article：全文索索 - PHP 站内搜索，mysql 是否该加 FULLTEXT ，效率与LIKE相比如何
Statement of this Website
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
Latest Articles by Author
Latest Issues
function_exists() cannot determine the custom function Function test () {return true;} if (function_exists ('test')) {echo "test is function...
From 2024-04-29 11:01:01
0
3
2250
How to display the mobile version of Google Chrome Hello teacher, how can I change Google Chrome into a mobile version?
From 2024-04-23 00:22:19
0
11
2388
The child window operates the parent window, but the output does not respond. The first two sentences are executable, but the last sentence cannot be implemented.
From 2024-04-19 15:37:47
0
1
2001
There is no output in the parent window document.onclick = function(){ window.opener.document.write('I am the output of the child ...
From 2024-04-18 23:52:34
0
1
1885
Where is the courseware about CSS mind mapping? Courseware
From 2024-04-16 10:10:18
0
0
1955
Related Topics
More>
Popular Recommendations
Popular Tutorials
More>
Related Tutorials
Popular Recommendations
Latest courses
Latest Downloads
More>
Web Effects
Website Source Code
Website Materials
Front End Template