为什么TortoiseGit的 "编辑冲突 "显示所有行都是冲突的？

Question

当把我的特性分支在originmaster的当前状态下重新归类时，Git通知我有冲突。

CONFLICT (directory/file): There is a directory with name modules/mod_name/shared/miniball in HEAD. Adding modules/mod_name/shared/miniball as modules/mod_name/shared/miniball~Poly-PS+Poly-Approx Arbeitsstand 01.07.2018
Auto-merging modules/mod_name/mod_nameExt.h
CONFLICT (add/add): Merge conflict in modules/mod_name/mod_nameExt.h 
Auto-merging modules/mod_name/mod_name.vcxproj
CONFLICT (add/add): Merge conflict in modules/mod_name/mod_name.vcxproj
Auto-merging modules/mod_name/mod_name.h
CONFLICT (add/add): Merge conflict in modules/mod_name/mod_name.h
Auto-merging modules/mod_name/mod_name.cpp
CONFLICT (add/add): Merge conflict in modules/mod_name/mod_name.cpp
Auto-merging modules/mod_name/ModuleVersion.h
CONFLICT (add/add): Merge conflict in modules/mod_name/ModuleVersion.h
Auto-merging modules/mod_name/Intern/pgen.h
CONFLICT (add/add): Merge conflict in modules/mod_name/Intern/pgen.h
Auto-merging modules/mod_name/Intern/pgen.cpp
CONFLICT (add/add): Merge conflict in modules/mod_name/Intern/pgen.cpp
Auto-merging modules/mod_name/Intern/ChainGenerator.h
CONFLICT (add/add): Merge conflict in modules/mod_name/Intern/ChainGenerator.h
Auto-merging modules/mod_name/Intern/ChainGenerator.cpp
CONFLICT (add/add): Merge conflict in modules/mod_name/Intern/ChainGenerator.cpp
Patch failed at 0008 Poly-PS+Poly-Approx Arbeitsstand 01.07.2018
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

当打开文件时 chaingenerator.cpp 与TortoiseGit编辑冲突对话框，它显示文件的每一行都是冲突的，甚至那些明显相似的行。

到重构基地为止的工作流程大致如下

git checkout master
git branch Dev_PolyApproxIntegration
git checkout Dev_PolyApproxIntegration

... <Editing&Commiting in Dev_PolyApproxIntegration> ...
... <Somebody pushing commits into master>

git branch Dev_PolyApproxIntegration_Rebase29_01
git checkout Dev_PolyApproxIntegration_Rebase29_01
git pull origin master
git rebase master

我不明白为什么Git不能处理（预期的）冲突，而这些冲突可能是由某些人提交到master中引起的，我创建了一个临时分支（...rebase29_01），因为过去我被同样的程序（和错误）烧伤了，希望有一个 "已知的好 "分支。我创建了一个临时分支(...rebase29_01)，因为在过去，我也曾被同样的程序（和错误）烧过，所以希望有一个 "已知的好 "分支，以便在事情失败时可以返回。否则，我的命令就应该是非常教科书式的东西，我认为。我执行工作流程的方式有什么问题吗？是某个人的提交给我弄坏了事情吗？我不知道他们做了什么。

还有，我接下来该怎么做？手动合并文件中的每一个差异是不可能的。

Answer 1

才发现问题所在。合并工具是根据git merge放的冲突标记来显示冲突的。