@b0rk This needs to be expressed more succinctly, but a pretty important advantage of merging is that it preserves semantic information completely lost by rebase, i.e. you can actually see when some feature development has started and ended.

Merging also helps with bisecting, but this is probably out of scope for this overview.