Skip to content

Error in Merge Documentation #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
flyingL123 opened this issue Nov 17, 2014 · 3 comments
Closed

Error in Merge Documentation #471

flyingL123 opened this issue Nov 17, 2014 · 3 comments

Comments

@flyingL123
Copy link

I believe there is a typo in the branching and merging documentation located here: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

In the diagram labeled "A merge commit", shouldn't the commit that "Master" points to be labeled "C6", not "C5"?
@doingweb
Copy link

doingweb commented Apr 1, 2015

Looks like the content isn't up-to-date with the upstream https://github.com/progit/progit2. This has already been fixed over there, but hasn't made it to the site yet. See #515.

@randomecho randomecho mentioned this issue Jan 8, 2016
Closed
@sxlijin sxlijin mentioned this issue Feb 8, 2017
Closed
@pedrorijo91
Copy link
Member

pedrorijo91 commented Feb 10, 2017 •
edited
Loading

seems a similar problem to #472 @peff ?

@sxlijin
Copy link
Contributor

sxlijin commented Feb 11, 2017

Closed by #952 @peff

@peff peff closed this as completed Feb 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
5 participants
@peff @sxlijin @doingweb @pedrorijo91 @flyingL123