除了 Xcode9 Project Navigator 中的文件名，↓ 和 C 是什么意思? [英] What does mean by ↓ and C besides file name in Xcode9 Project Navigator?

问题描述

<块引用>

我知道 M、A、U、?、R、I.

我搜索了 ↓ 和 C 但没有找到任何有用的资源.

解决方案

C 意味着 冲突 — 您尝试合并(或由于拉取而隐式合并)一个分支，其中在标记文件中，git 无法自动解决您的工作副本和另一个分支之间的差异.您需要使用 Xcode 的版本编辑器或外部工具手动决定要保留每一方的哪些更改，然后告诉 git 冲突已解决(在 Xcode 中，您可以通过右键单击导航器中的文件来执行此操作).

↓ 意味着你的工作副本在另一个分支后面"有一定数量的提交(在这种情况下，因为冲突意味着它无法赶上).

I know about M, A, U, ?, R, I.

I searched for the ↓ and C but not found any helpful resources.

This post doesn't contain info about ↓.

Can anyone tell me what indicates these symbols?

Thank you in advance.

解决方案

C means conflict — you tried to merge (or implicitly merge due to a pull) a branch where, in the marked file, git can't automatically resolve the differences between your working copy and the other branch. You'll need to use Xcode's version editor or an external tool to manually decide which changes from each side to keep, then tell git that the conflicts are resolved (IIRC in Xcode you can do this by right-clicking on the file in the navigator).

↓ means your working copy is "behind" the other branch by some number of commits (in this case, because the conflict meant it couldn't catch up).

这篇关于除了 Xcode9 Project Navigator 中的文件名，↓ 和 C 是什么意思?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！