Would it make sense to rebase/merge anyway but discard those changes and document in the changelog why?
Would it make sense to rebase/merge anyway but discard those changes and document in the changelog why?