All your rebase are belong to clean history

Okay that was pretty bad

But so is this…

And that

It’s just a bit… meaningless, you know?

And rebasing is simple

Instead of:

You do this:

Same amount of commands

Cleaner history

Meaningful diffs

Your commits are replayed over what is on

master

So rather than adding an additional commit to fix conflicts you edit your existing commits

Merges break the atomic self-contained commits

we want

Rebase is the tool to solve the problem

git config —global pull.rebase true

Thanks for your attention, Luke