Git fails to merge or pull local repos
This question already has an answer here:
A conflict is that git finds that the merge underlying the pull you want to make, will result in loss of code because they "touch" the same lines so a change done on one computer will eradicate the changes done on the other computer.
You normally do not want this. The default behavior of git is to give you the necessary information and require you to resolve the conflicts manually. When done, you need to commit the final result causing git to consider the conflict resolved.
Your wording indicates that you are unfamiliar with these concepts. I would suggest studying the "Pro Git" book, especially the "Basic branching and merging" chapter available at https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
链接地址: http://www.djcxy.com/p/7230.html上一篇: 什么是Git最好的视觉合并工具？
下一篇: Git无法合并或拉本地回购