我该如何解决这些错误

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 它们。当您添加了所有内容并且您的测试通过后，提交。

可以在 Basic Branching and Merging section of Pro Git 中找到更多信息。

我该如何解决这些错误

How do I resolve those errors

git

merge

commit