为什么TortoiseGit“编辑冲突”将所有行显示为冲突

Question

在将功能分支基于当前的原始/主状态时，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".

在TortoiseGit编辑冲突对话框中打开文件chaingenerator.cpp时，它显示文件的每一行都有冲突，甚至明显相似的行。

直到重新建立基础的工作流程大致如下

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无法处理（某些）可能由于某些主体提交而变成主控的（预期）冲突。 我创建了一个临时分支（... rebase29_01），因为过去，我已经被完全相同的过程（和错误）所累，并且希望如果事情失败，可以返回一个“已知良好”的分支。 否则，我的命令应该是很多教科书，恕我直言。我执行工作流程的方式是否有问题？是不是有人为我破坏了事情？我不知道他们做了什么。

另外，我该怎么走？手动合并文件中的每个差异都是不可能的。

Answer 1

只需找出问题所在。合并工具根据git merge放置的冲突标记显示冲突。