BigW Consortium Gitlab
Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326