git - 如何获得与 merge 命令相同的关于 merge 冲突的输出？

Question

当我第一次尝试 merge 时发现有冲突，我得到了一个非常有用和可读格式的输出:

CONFLICT (rename/delete): Folder/Folder/file.txt deleted in branch_to_merge and renamed in HEAD. Version HEAD of Folder/Folder/file.txt left in tree.
CONFLICT (content): Merge conflict in Folder/Folder/file2.txt

但是，当我之后运行 git status 或 git ls-files -u 时，它会以其他格式显示 merge 状态，我个人认为这不太有用。

我可以在不重新启动 merge 过程的情况下再次获得该输出吗？

Answer 1

这是您要找的吗？

git diff --name-only --diff-filter=U

我一直在使用各种冲突案例。例如，当 cherry-pick 因 config.js 中的冲突而失败时，我运行它并获得以下输出:

> git cherry-pick xxxxxxx..yyyyyyy
error: could not apply xxxxxxx... implement feature mmm
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

> git diff --name-only --diff-filter=U
config/config.js

顺便说一句，我在我的 ~/.gitconfig 中为它设置了一个别名 conflict:

[alias]
  conflict = diff --name-only --diff-filter=U