Rebase

Git is awesome. That is, until someone tells you to squash rebase instead of merge and now you’ve deleted the entire codebase and brought down Fastly (not what happened, but you never know). So in this article, I’ll explain what a rebase is, compare it to a merge, and at the end provide some aliases … Read more