Skip to content

Possible Typo? #472

Closed
Closed

Description

@daveomcd

Didn't see a contact form or anything on the following website: http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell

I believe there is a typo at the bottom of this article; however, I'm probably wrong. It seems the "Divergent history" graph references 'c2b9e' to the Testing branch, and '87ab2' to the master branch. The console output below it however states the reverse.

Activity

  1. daveomcd commented on Nov 17, 2014

    @daveomcd
    Author

    image

  2. dennisschagt commented on Feb 4, 2015

    @dennisschagt

    It looks like this is fixed in the progit2 repository by changing the image to match the console output, in commit progit/progit2@8725418

  3. pedrorijo91 commented on Feb 10, 2017

    @pedrorijo91
    Member

    what is it needed to have the image updated on the website also @peff ? I though the images were reused from the book repository

    if not, let me know the process, so that I can do a PR fixing it

  4. peff commented on Feb 10, 2017

    @peff
    Member

    I'm not sure why we don't have the updated images (if we failed to import them, or if they're in the repo but need something special done with the asset code to be served on the site). Some discussion in #515 (comment), but I haven't had a chance to dig deeper.

  5. jnavila commented on Feb 10, 2017

    @jnavila
    Contributor

    It was fixed last november. We haven't pulled since then.

  6. peff commented on Feb 10, 2017

    @peff
    Member

    I don't think that's it. The versions I pulled in #775 have several fixes. E.g., see https://github.com/git/git-scm.com/pull/775/files#diff-812dfc5fbd8656872fbf64fe9ffd8c57 for this case.

    But the ones you added in 4d71b81 don't have the fixes. So I think we actually were fixed for a while, but regressed recently.

    The ones from #775 were mined out of the Atlas-generated zipfile (and as a result, you can see in the diff linked above that the resolution isn't quite as good). So I think we need to re-import, but do it directly into your new image hierarchy.

  7. peff commented on Feb 10, 2017

    @peff
    Member

    Fixed by #952.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions