What is a fast-forward merge?
Lets say we create a new, empty Git repository. We do an initial commit on the
master branch, then checkout a new branch,
new_branch, and make a couple commits on it.
We might have a Git history that looks something like this:
new_branch is a couple of commits in front of
master. If we checkout
master and merge with
new_branch, we get this:
master was “fast-forwarded” to get …