←back to thread

1062 points mixto | 2 comments | | HN request time: 0s | source
1. defanor ◴[] No.42955126[source]
In section 5.7:

> But in this section we’re going to be talking about a specific kind of merge: the fast-forward. This occurs when the branch you’re merging from is a direct ancestor of the branch you’re merging into.

Looks like "from" and "into" are swapped: "main" is "into" there, "newbranch" is "from", and "main" is a direct ancestor of "newbranch".

replies(1): >>42967180 #
2. beej71 ◴[] No.42967180[source]
D'oh! Fixed.