The wiki article is a great resource! I see its URL distributed widely as best-in-class advice for how to do this. However, many people who follow the instructions wind up with merge commits in their local repositories, which is not so good.
Proposed fix: Add step 8 for choosing "Rebase and merge" with an optional step of confirming that the SHA for the original and current repositories are the same.
The wiki article is a great resource! I see its URL distributed widely as best-in-class advice for how to do this. However, many people who follow the instructions wind up with merge commits in their local repositories, which is not so good.
Proposed fix: Add step 8 for choosing "Rebase and merge" with an optional step of confirming that the SHA for the original and current repositories are the same.