gitpullU,A和D标签:意思？

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

我不明白"U","A"和"D"的标签.有人可以告诉我这是什么意思吗？谢谢.

你可以看到这些字母详述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)

其他字母列在" 什么"中,T"是什么意思" 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"(未合并文件)一致.
请参阅" 为什么git说"因为你有未合并的文件而无法拉动"？ "

要解决此问题,您必须先解决有问题的合并冲突,然后添加并提交更改,然后才能执行此操作git pull.