[3.6 Git Branching - Rebasing] - C3' is missing in Figure 40

Open
#2,008 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
2/5
Estimated time
1-3 hours
Newbie friendliness
55/100
Issue type
Documentation
Clarity
Clearly specified
Activity status
Stale
Tech stack
git
Domain
documentation

Research direction

Start with the source files for Figures 39–41 in the Pro Git book and reproduce the git rebase --onto master server client sequence described in the issue. Compare the diagrams with the expected commit sequence, then verify that the corrected Figures 40 and 41 render correctly on the website and in the PDF.

Written by the indexing model from the issue text.

Description

bug
There's no existing/similar bug report.
  • I have searched the existing issues
This report is about a single actionable bug.
  • I'm reporting a single actionable bug
This report is about the ProGit book, version 2, English language.
  • This bug is not about a translation or old version
Bug covers book website/pdf
  • I confirm the bug is about the book as found on the website/pdf
Problem is present in the Pro Git book on the website?
  • This bug also affects the Pro Git book as published on the website.
Which version of the book is affected?

Source files

Describe the bug:

After the command

git rebase --onto master server client

The commit C3 is also re-based in top of master C6. The lack of C3' in Figure 40 and Figure 41 is a bug and causes confusion in the understanding of the topic.

Steps to reproduce:
  1. Do all git commands to reproduce Figure 39 in your local test repository
  2. run:

git rebase --onto master server client

After solving the merge conflicts, you will notice that C3 is part of the rebase.

Expected behavior:

At Figure 40 and Figure 41, the master line shall be:
C1 - C2 - C5 - C6 - C3' - C8' - C9'

Screenshots:

No response

Additional context:

No response

Device

No response

Operating system

No response

Browser/application + version

No response

Dominant language
CSS
Stars
6.6k
Forks
2.1k
PR merge metrics
No merged PRs in 30d

Getting set up

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from progit/progit2

All issues in progit/progit2

Similar issues

More Documentation issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.