[fahrradflucht]

Obviously you have to test the combination but the merging allows an easier rollback.

[Mithaldu]

Easier? How so? If a rebase of a branch isn't successful you just reset back to the commit you rebased onto, and continue work on your old pre-rebase branch.