You could just preserve the history (= don't use rebase, just merge), it has benefits too in addition to making your immediate life easier and safer.