我如何解决这些错误？

Question

下面是我的github shell的会话日志：

C:\Users\Igor\OneDrive\Documents\dbhandler_app [master +258 ~0 -0 | +85 ~23 -269 !]> git commit
U       dbinterface/Debug/dbinterface.Build.CppClean.log
U       dbinterface/Debug/dbinterface.log
U       dbinterface/ReadMe.txt
U       dbinterface/database.h
U       dbinterface/dbinterface.sln
U       dbinterface/dbinterface.vcxproj
U       dbinterface/dbinterface.vcxproj.filters
U       dbinterface/dbinterface.vcxproj.user
U       dbinterface/stdafx.cpp
U       dbinterface/stdafx.h
U       dbinterface/targetver.h
error: commit is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
C:\Users\Igor\OneDrive\Documents\dbhandler_app [master +258 ~0 -0 | +85 ~23 -269 !]> git merge
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
C:\Users\Igor\OneDrive\Documents\dbhandler_app [master +258 ~0 -0 | +85 ~23 -269 !]> git merge --no-commit
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

看起来我无法提交，因为我没有合并，但是合并也失败了。

那我该怎么解决呢？

Answer 1

合并只是多个父级的提交。合并冲突与任何其他未完成的工作一样有效。任何成功合并的文件都将被分阶段(添加)。任何合并失败的文件都不会被搁置；它们将部分地与显示冲突行的标记(<<<<<)合并。一个git status将向您展示这一点并给您指示。

按照通常的方式完成提交:编辑未分阶段的文件，以修复冲突并对其进行add。当您添加了所有内容，并且测试通过后，提交。

更多信息可以在基本分支与合并的亲Git部分找到。