In the first article in this series (Git: Rebase vs Merge) I covered the tactics of rebasing. I discussed what merge commits are, and how to avoid them with rebasing. In this post I'll cover the benefits of rebasing, including how its use speeds up finding hard to track down bugs via git blame and git bisect.
Distributed version control (git): Check.
Feature branches: Check.
Rebasing: Ugh, seriously?
On multiple projects I've attempted to introduce the concept of rebasing commits. It rarely goes well (at first). The initial reaction tends to be reluctance and confusion.