git pull U、A 和 D 标签 : Meaning?

Question

git pull 偶尔会给我消息如下:

我不明白“U”、“A”和“D”的标签。有人可以告诉我这些是什么意思吗？谢谢。

Answer 1

您可以在 man git diff-files 中详细查看那些字母:

A: addition of a file
D: deletion of a file
U: file is unmerged (you must complete the merge before it can be committed)

其他字母列在“What does “T” mean in “git status”?”

C: copy of a file into a new one
D: deletion of a file
M: modification of the contents or mode of a file
R: renaming of a file
T: change in the type of the file
X: "unknown" change type (most probably a bug, please report it)

---

关于“Pull is not possible because you have unmerged files”错误信息，它与你在输出中看到的“U”(未 merge 文件)一致。
参见“Why does git say “Pull is not possible because you have unmerged files”?”

To resolve this, you will have to resolve the merge conflicts in question, and add and commit the changes, before you can do a git pull.