On Wed, Sep 2, 2015 at 7:45 PM, Jesper Jørgensen <jesper.jorgen...@prevas.dk> wrote: > Hi, > > 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. >
Indeed you are correct. Looks like this was fixed a while ago https://github.com/progit/progit2/commit/3491527b33251fcacd8d2964bf7fb5e0f1cfe455 but hasn't made it into the "live" website. -- 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
