Hi Jesper, On 2015-09-02 09:45, Jesper Jørgensen wrote:
> I am learning how git works, and is using the excellent book on the > official site. > I believe I have located a mistake in one of the images. > It is about Figure 3.17 on this page : > http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging > > As far as I understand it, the right most snapshot called C5 should > have been named C6. > The texts describes a new snapshot being made from the merge of the 2 > branches. > Having 2 snapshots both named C5 does not seem like it can be possible. Your hunch is correct, and it should be C6, that's why it was changed: https://github.com/progit/progit2/blob/master/book/03-git-branching/images/basic-merging-2.png I do not know why it is still displayed incorrectly on https://git-scm.com/, but your best bet would be to report this as a bug: https://github.com/git/git-scm.com/issues But make sure first that there is not another ticket opened for the same bug! Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
