How Git no-ff Merges Work

Wondering what the difference between a fast-forward merge and a no-ff Git merge is? The difference has to do with how the git history is made linear with a fast-forward merge, while the branch history remains when a Git no-ff merge is performed.

In this quick no-ff get merge example, we'll show you the fast foward merge works, we'll show a git no-ff example, and we'll talk about the benefits of having a linear Git commit history.

Oh, by the way, the git no-ff merge command is as follows:

git merge otherbranch --no-ff

[paulliu]

Really clear and detailed explanation! Thanks!

[baobaoliu]

Nice and simple example, made it very easy to follow along with. Thanks :)

[laurentdocquir]

Hi Cameron, nice and effective explanation. I found it very useful.

[tech]

I really want to watch this video, but the audio is so horrible, I can't listen to a second, without blowing my ears off