Skip to content

Draft: Clarify origin of changes in merge conflicts

Pedro Moreira da Silva requested to merge pms-merge-conflicts-ux into master

What does this MR do and why?

Clarify origin of changes in merge conflicts. Also:

  • Applies “Title case” to the merge conflicts page title in the breadcrumb.
  • Fixes button width and padding

Related to #329842

Todo

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Before After
CleanShot 20240418163535@2x.png CleanShot 20240418162842@2x.png

How to set up and validate locally

  1. If using the GDK with seeded data, visit /gitlab-org/gitlab-test/-/merge_requests/9/diffs
  2. If using an empty instance:
    1. Make changes in a new branch and create an MR
    2. Edit the same lines in the target branch
    3. Visit the MR and select “Resolve conflicts” to view the conflict editor
Edited by Pedro Moreira da Silva

Merge request reports