简体   繁体   English

Eclipse绘制的提交图中彩色线条的含义是什么?

[英]What is the meaning of colored lines in commit graphs drawn by Eclipse?

I'm trying to understand some parts of the GIT graph in Eclipse. 我试图了解Eclipse中GIT图的某些部分。

We'll refer to commiters as G, A, R, J and K. 我们将通勤者称为G,A,R,J和K.

In this case, we have two branches : master, and agfa (dev branch). 在这种情况下,我们有两个分支:master和agfa(dev分支)。 Commit 5cc4355 : What does the green line means? 提交5cc4355:绿线是什么意思? It's not a new branch, so I guess it means the local repository has diverged... somehow. 它不是一个新的分支,所以我猜这意味着本地存储库已经分歧......不知何故。 Commit 9d4035d : Here, "A" merged the agfa branch to the master. Commit 9d4035d :这里,“A”将agfa分支合并到master。 But why is the merge on the yellow line, instead of the actual master? 但为什么合并在黄线上而不是实际的主线? (blue). (蓝色)。

I guess I'm just confused by the fact that simultaneous developpers works on different workspace... but if someone could confirm what's happening, that would be very helpful :) 我想我只是因为同时开发人员在不同的工作空间工作而感到困惑......但如果有人能确认发生了什么,那将非常有帮助:)

Eclipse links related commits with colored lines to help you read the commit graph, but those colored lines have little to do with branches (in the Git sense). Eclipse将带有彩色线条的相关提交链接起来以帮助您阅读提交图,但这些彩色线与分支几乎没有关系(在Git意义上)。

The Git terminology is a bit confusing, but remember that a branch is nothing more than a reference that points to a particular commit at a given time . Git术语有点令人困惑,但请记住, 分支只不过是指向给定时间的特定提交引用

You shouldn't conflate Git branches and whatever your IDE uses to represent a sequence of related commits. 您不应该混淆Git分支以及IDE用于表示一系列相关提交的任何内容。

Commit 5cc4355 : What does the green line means? 提交5cc4355:绿线是什么意思? It's not a new branch, so I guess it means the local repository has diverged... somehow. 它不是一个新的分支,所以我猜这意味着本地存储库已经分歧......不知何故。

Note that two lines (blue and green) stem from commit 5cc4335 . 请注意,两行(蓝色和绿色)源于提交5cc4335 This indicates a divergence in history: two different branches were originally pointing at that commit, but then different things happened in those two branches (ie different commits were created on those two branches), hence the divergence at that node of the commit graph. 这表明历史存在分歧:两个不同的分支最初指向该提交,但随后在这两个分支中发生了不同的事情(即在这两个分支上创建了不同的提交),因此提交图的该节点处的分歧。

Here, "A" merged the agfa branch to the master. 这里,“A”将agfa分支合并到主人。 But why is the merge on the yellow line, instead of the actual master? 但为什么合并在黄线上而不是实际的主线? (blue). (蓝色)。

That commit message indicates that, when contributor A merged branch agfa into master , master was pointing at commit 9d4035d . 该提交消息表明,当贡献者A将agfa合并为mastermaster指向commit 9d4035d The color of the line (yellow) is irrelevant. 线条的颜色(黄色)无关紧要。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM