{"thread":{"id":"40248","subject":"Git book figure bug","startedAt":"2015-09-02T07:45:21Z","lastAt":"2015-09-02T08:39:22Z","messageCount":3,"participants":["Jesper Jørgensen","Chris Packham","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"269189","messageId":"FADA8795DF99B842A563D149FBDDAE5F58341EF5@VMPREVAS2.prevas.se","threadId":"40248","inReplyTo":null,"subject":"Git book figure bug","fromName":"Jesper Jørgensen","fromEmail":"jesper.jorgensen@prevas.dk","sentAt":"2015-09-02T07:45:21Z","receivedAt":"2015-09-02T07:45:21Z","isPatch":false,"sender":{"key":"jesper.jorgensen@prevas.dk","avatar":null},"body":"Hi,\n\nI am learning how git works, and is using the excellent book on the official site. \nI believe I have located a mistake in one of the images. \nIt is  about Figure 3.17 on this page : http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging\n\nAs far as I understand it, the right most snapshot called C5 should have been named C6. \nThe texts describes a new snapshot being made from the merge of the 2 branches. \nHaving 2 snapshots both named C5 does not seem like it can be possible. \n\nBest regards\nJESPER JØRGENSEN, Prevas A/S\nSoftware developer, Aarhus\nHedeager 1, DK-8200 Aarhus N \nPhone +45 87438070\nMobile +45 40282198\njesper.jorgensen@prevas.dk\nwww.prevas.dk\n\n \n"},{"id":"269192","messageId":"CAFOYHZChEdNJq2g5mcNL0AmTFUmMmuZ26Rpqv6gzbsNCcTvbLQ@mail.gmail.com","threadId":"40248","inReplyTo":"FADA8795DF99B842A563D149FBDDAE5F58341EF5@VMPREVAS2.prevas.se","subject":"Re: Git book figure bug","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2015-09-02T08:36:58Z","receivedAt":"2015-09-02T08:36:58Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On Wed, Sep 2, 2015 at 7:45 PM, Jesper Jørgensen\n<Jesper.Jorgensen@prevas.dk> wrote:\n> Hi,\n>\n> I am learning how git works, and is using the excellent book on the official site.\n> I believe I have located a mistake in one of the images.\n> It is  about Figure 3.17 on this page : http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging\n>\n> As far as I understand it, the right most snapshot called C5 should have been named C6.\n> The texts describes a new snapshot being made from the merge of the 2 branches.\n> Having 2 snapshots both named C5 does not seem like it can be possible.\n>\n\nIndeed you are correct. Looks like this was fixed a while ago\nhttps://github.com/progit/progit2/commit/3491527b33251fcacd8d2964bf7fb5e0f1cfe455\nbut hasn't made it into the \"live\" website.\n"},{"id":"269193","messageId":"bf22f191aed6809871e33fd9b34f5267@www.dscho.org","threadId":"40248","inReplyTo":"FADA8795DF99B842A563D149FBDDAE5F58341EF5@VMPREVAS2.prevas.se","subject":"Re: Git book figure bug","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-09-02T08:39:22Z","receivedAt":"2015-09-02T08:39:22Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Jesper,\n\nOn 2015-09-02 09:45, Jesper Jørgensen wrote:\n\n> I am learning how git works, and is using the excellent book on the\n> official site.\n> I believe I have located a mistake in one of the images.\n> It is  about Figure 3.17 on this page :\n> http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging\n> \n> As far as I understand it, the right most snapshot called C5 should\n> have been named C6.\n> The texts describes a new snapshot being made from the merge of the 2 branches.\n> Having 2 snapshots both named C5 does not seem like it can be possible.\n\nYour hunch is correct, and it should be C6, that's why it was changed:\n\nhttps://github.com/progit/progit2/blob/master/book/03-git-branching/images/basic-merging-2.png\n\nI 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\n\nBut make sure first that there is not another ticket opened for the same bug!\n\nCiao,\nJohannes\n"}]}