[William_BB]

We squash, but still rebase. For us, this works quite well. As you said, rebasing needs to be done carefully... But the main history does look nice this way.

[mattbillenstein]

Why bother with the rebase if you squash anyway? That history just gets destroyed?