eclipse - 需要帮助理解 Eclipse 中的 Git 图标

Question

我正在努力让我的项目提交 - 但我遇到了错误。

我正在查看同步透视图，不明白所有文件图标的含义。谁能给我一个很好的引用，告诉我每个图标的含义？

如:

• 蓝色箭头指向左边
• 双红箭头
• 红色正方形上的白色 X
• 白色+双红色箭头
• 指向左边的蓝色箭头，上面有一条白色破折号
• 感叹号
• 灰色箭头指向右边
• 带白色+号的灰色箭头指向右边
• 上面有白色星号的灰色框。

Answer 1

您可以在 "Synchronize View" section 中找到很好的描述的 Egit manual :

This state is shown by using icons and can also be configured to show the state as text appended to the resource name.

• An incoming addition means that a resource has been added to the target branch.
• An incoming change means that the file has changed in the target branch.
• An incoming deletion means that a resource was deleted from the target branch.
• An outgoing addition means that the file was added to your workspace or source branch and is not yet in the target branch.
• An outgoing change means that the file was changed in your workspace or source branch.
• An outgoing deletion is a resource that has been deleted in your workspace or source branch.
• A conflicting addition means that the resource has been added in your workspace or source branch and in the target branch.
• A conflicting change means that the file has been changed in your workspace or local branch and in the target branch. A manual or automatic merge will be required. Also, any entries in the view that contain children that are conflicts will also be decorated with the conflict icon. This is done to make conflicts easy to find.
• A conflicting deletion means that the resource was deleted in your workspace or source branch and in the target branch.

在您的情况下，请记住这些叠加图标可以另外出现在status overlay icons 中。 :

这包括:

• dirty (folder) - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository.
• tracked - The resource is known to the Git repository and hence under version control.
• untracked - The resource is not known to the Git repository and will not be version controlled until it is explicitly added.
• ignored - The resource is ignored by the Git team provider. The preference settings under Team > Ignored Resources, "derived" flag and settings from .gitignore files are taken into account.
• dirty - The resource has changes in the working tree that are neither in the index nor in the repository.
• staged - The resource has changes which have been added to the index. Note that adding changes to the index is currently possible only in the commit dialog via the context menu of a resource.
• partially-staged - The resource has changes which are added to the index and additional changes in the working tree that neither reached the index nor have been committed to the repository. See partial staging from the Git Staging view for how to do that.
• added - The resource has not yet reached any commit in the repository but has been freshly added to the Git repository in order to be tracked in future.
• removed - The resource is staged for removal from the Git repository.
• conflict - A merge conflict exists for the file.
• assume-valid - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. Also see Assume unchanged action.