I had updated “git bootcamp” chapter in the devguide already. (pull request)
But I found another part which recommends rebase over merge. https://devguide.python.org/pullrequest/#step-by-step-guide