git冲突处理
(场景:A和B修改相同的文件,A先提交到远程仓库,然后B提交push报错,远程仓库有更改,git自动合并失败,需要手动合并
![](https://app.yinxiang.com/shard/s18/res/e01b6eeb-f943-49d3-85e6-825dae766187/1536292018.jpg?search=%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6)
提示错误:Automatic merge failed; fix conflicts and then commit the result.
![](https://app.yinxiang.com/shard/s18/res/ffd2b01f-18e7-4e25-8b1b-9f2f9c0d8eaf/1536291703%281%29.jpg?search=%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6)
打开冲突的文件,删除特殊字符(蓝色框框)
![](https://app.yinxiang.com/shard/s18/res/e9c3aa5d-d467-45e0-88d0-0f0046fd649f/1536292260%281%29.jpg?search=%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6)
![](https://app.yinxiang.com/shard/s18/res/ac6fde98-b457-45df-99c9-63ef8b8fca71/1536292450%281%29.jpg?search=%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6)
最后,依次执行就可以啦!
![](https://app.yinxiang.com/shard/s18/res/d48952b0-86b0-46ab-8c60-c20695d2537f/1536292864%281%29.jpg?search=%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6)
转载于:https://www.cnblogs.com/web-zqk/p/9603799.html