Git(十一)协同开发时冲突解决
2018-07-26 本文已影响2人
leeqico
(1)liqingchao修改本地文件
![](https://img.haomeiwen.com/i2058461/4aec00e4e83522a4.png)
(2)修改的内容如下:edit by liqingchao
![](https://img.haomeiwen.com/i2058461/e66a4ac1323d4096.png)
(3)提交到本地仓库
![](https://img.haomeiwen.com/i2058461/2d01a5752f058e68.png)
(4)删除凭证
![](https://img.haomeiwen.com/i2058461/3d6dd6ef96244aeb.png)
(5)输入提交到远程仓库,会提示你登录远程仓库的账号
![](https://img.haomeiwen.com/i2058461/de1a962d6cb351d1.png)
(6)使用377028432@qq.com这个账号登录,就是leeqico
![](https://img.haomeiwen.com/i2058461/676719ae302ea48f.png)
(7)提交完成
![](https://img.haomeiwen.com/i2058461/6a4d0a5a7758f7c4.png)
(8)再把凭据删掉
![](https://img.haomeiwen.com/i2058461/491352244f78abbf.png)
(9)切换到另外一个本地仓库
![](https://img.haomeiwen.com/i2058461/55ddf02685f26720.png)
![](https://img.haomeiwen.com/i2058461/6211c4bb7fe83f35.png)
(10)提交到本地仓库
![](https://img.haomeiwen.com/i2058461/18746037af1ca67d.png)
(11)提交到远程仓库
![](https://img.haomeiwen.com/i2058461/a7b19b1893262f24.png)
(12)推送失败,因为有冲突
![](https://img.haomeiwen.com/i2058461/8cda0663d5d15f00.png)
(13)先拉取最新的文件
![](https://img.haomeiwen.com/i2058461/27c3cb6b3cc7daf2.png)
(14)修改冲突的文件
![](https://img.haomeiwen.com/i2058461/88a0b989080719b3.png)
![](https://img.haomeiwen.com/i2058461/45b036822361bda1.png)
(15)重新提交到本地仓库,然后再推送到远程仓库中
![](https://img.haomeiwen.com/i2058461/3cbcfd066473d98c.png)
要点:
如果不是基于GitHub 远程库的最新版所做的修改,不能推送,必须先拉取。
拉取下来后如果进入冲突状态,则按照“分支冲突解决”操作解决即可。