Here we go again, explaining the internals of Git with the intention of helping you understand what you're doing day-to-day. Last time I covered branches, HEAD, and fast-forwarding . Today we'll dive into the guts of merging and rebasing. Merging branches...