In my organization we use merge commits because references to the original commits in the PR discussion (including code comments) get all confused after a rebas

In my organization we use merge commits because references to the original commits in the PR discussion (including code comments) get all confused after a rebase. Is there a good way to avoid that?