Understanding Rebase (And Merge) in Git

While merging is definitely the easiest and most common way to integrate changes in Git, it's not the only one: "Rebase" is an alternative (and slightly advanced) means of integration. The Case Against Merge Commits A normal commit, carefully created...