progit / progit2

Pro Git 2nd Edition
Other
5.69k stars 1.88k forks source link

Incorrect description of git pull behavior in Chapter 3.5 of Pro Git book V2 #1962

Open Manimestro opened 1 week ago

Manimestro commented 1 week ago

There's no existing/similar bug report.

This report is about a single actionable bug.

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

Bug covers book website/pdf

Problem is present in the Pro Git book on the website?

Which version of the book is affected?

Source files

Describe the bug:

The Pro Git v2 book contains a misleading statement about the behavior of git pull in Chapter 3.5 link: https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches

The current statement is:

"git pull will look up what server and branch your current branch is tracking, fetch from that server and then try to merge in that remote branch."

This implies that the merge happens in the remote branch, which is incorrect. The correct behavior is that the merge happens in the local branch.

Steps to reproduce:

  1. Go to https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches
  2. Scroll down to "Pulling" section
  3. See error

Expected behavior:

Current Statement: "git pull will look up what server and branch your current branch is tracking, fetch from that server and then try to merge in that remote branch."

Corrected Statement: "git pull will look up which server and branch your current branch is tracking, fetch from that server, and then try to merge that remote branch into your current local branch."

Screenshots:

Screenshot 2024-06-23 at 13 24 02

Additional context:

Location: Chapter 3.5, Section Pulling Link: https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches

Device

desktop

Operating system

macos

Browser/application + version

google chrome