git pull U、A 和 D 标签：含义？

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”（未合并文件）一致。
见“Why does git say “Pull is not possible because you have unmerged files”?”

要解决此问题，您必须先解决相关合并冲突，然后添加并提交更改，然后才能执行git pull。