Thanks for sharing. The issue in question has been closed, and the discussion on changing the behaviour and improving the UX happens in - Manually resolve conf

Thanks for sharing. The issue in question has been closed, and the discussion on changing the behaviour and improving the UX happens in - Manually resolve conflicts in merge commit on the target branch: https://gitlab.com/gitlab-org/gitlab/-/issues/25014 https://gitlab.com/gitlab-org/gitlab/-/issues/25014 - Add in application explanation of what Resolve Conflicts is doing: https://gitlab.com/gitlab-org/gitlab/-/issues/25003 https://gitlab.com/gitlab-org/gitlab/-/issues/25003 I've added that as a comment to https://gitlab.com/gitlab-org/gitlab-foss/-/issues/35054#note_445601945 https://gitlab.com/gitlab-org/gitlab-foss/-/issues/35054#not...