You may be wondering at the strange title for my blog. Well, I coined the phrase squabaserge several months ago, because for the majority of the repositories that server Lonely Planet content, we follow the process:

  1. Squash multiple commits into one.
  2. Rebase your branch off of master.
  3. Merge your branch (after review).

It's also versatile!

Let's say you don't need to rebase your branch because no one else has commited changes. Well, that's a squerge. If you only have one commit, then you need to baserge. While you're working on a branch, and you're not ready to merge back into master, but you want to get changes that someone else merged, then you can do a squabase.

Just in case you've never squashed before, you can read about squashing commits with rebase.