git：试图合并分支，但有冲突的吨，其中大部分/不应该/是冲突 [英] git: trying to merge branches, but there are TONS of conflicts, and most of them /shouldn't/ be conflicts

问题描述

这是我得到的很多：

 <<<<<<< < HEAD 
 code 
 ======= 
>>>>>>>将code_url的分支'master'合并为not_master 
  

，其中40+文件。是否有另一种合并方式可以正确解决冲突？我觉得每当遇到文件位置的同时存在差异时，git会决定翻转所有表格。

（╯°□°）╯(buıbɹǝɯʇıb p>

我看着rebase，这可能是我开始分行时所需要的。开始重新贷款 - 我仍然需要处理所有这些冲突。

解决方案

我经常看到这个，当git有记录的行被删除时，它似乎不想自动合并，如果行已在一个分支中编辑但在另一分支中删除。

Here is a lot of what I'm getting:

<<<<<<< HEAD
code
=======
>>>>>>> Merge branch 'master' of code_url into not_master

and there are tons of those occurring multiple times in 40+ files. Is there a different way to merge such that it correctly resolves conflicts on its own? I feel like whenever it encounters any simultaneous difference in a location a file, git decides to flip ALL THE TABLES.

(╯°□°）╯︵ buıbɹǝɯ ʇıb

I looked at rebase, and it MAY have been what I have needed when I started the branch. To start rebasing - I still need to deal with all these conflicts.

解决方案

I've often seen this when git has record of lines being deleted. It doesn't seem to want to auto-merge if a line has been edited in one branch but deleted in another.

这篇关于git：试图合并分支，但有冲突的吨，其中大部分/不应该/是冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！