On branch test
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: Git Basics.docx
no changes added to commit (use "git add" and/or "git commit -a")
我正在尝试将来自
develop
分支的文件合并到test
分支中。通常情况下我没有问题,但这是我第一次处理Word文档产生的冲突。下面的链接对我理解如何解决合并冲突很有帮助- https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ 从该链接,我期望看到类似以下内容:
If you have questions, please
<<<<<<< HEAD
open an issue
=======
ask your question in IRC.
>>>>>>> branch-a
这告诉我冲突发生的位置和内容。但是我无法在Word文档中查看它。
有人能指点我正确的方向吗?