And another showing a linear history of the same project that uses fast-forward merges as Adam recommends:

A short article about how Git hash-based decentralized filesystem work

The Git Flow process is a proven method for managing version control and release of software.

Feature branches aren't the only possible Git strategy, and this article will cover an alternative way to manage new features without merge conflicts issues

Knowing how to use and create branches, commits, and pull requests are basic concepts, but not everyone gives them the importance they deserve.