Prevent rebase from being run in quick action when there are conflicts

See merge request gitlab-org/gitlab!51243