Rebased fixes are easier to audit, so I can see an open source project preferring them. Otherwise, just freely merge to/from trunk. Prevent criss-cross merges t

Rebased fixes are easier to audit, so I can see an open source project preferring them. Otherwise, just freely merge to/from trunk. Prevent criss-cross merges though, those are a pain.