progit2 icon indicating copy to clipboard operation
progit2 copied to clipboard

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

Open dmpossa opened this issue 1 year ago • 0 comments

There's no existing/similar bug report.

  • [X] I have searched the existing issues

This report is about a single actionable bug.

  • [X] I'm reporting a single actionable bug

This report is about the ProGit book, version 2, English language.

  • [X] This bug is not about a translation or old version

Bug covers book website/pdf

  • [X] 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?

  • [X] 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

dmpossa avatar Jan 01 '25 21:01 dmpossa