Prevent fast forward merge when rebase is required

Closes #39773

See merge request gitlab-org/gitlab-ce!15296

(cherry picked from commit f7537ce0)

bddbb90f Prevent fast forward merge when rebase is required