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.
  • Use `gl-button
  • Remove all theme-specific CSS for button colors
  • Use <<<<< and >>>>> for target vs source branch changes (to match IDEs)

Related to #329842

Todo

  • Update docs
  • Add commit SHA (and possibly commit message) to source branch

Screenshots or screen recordings

Before After
Screenshot_2024-10-21_at_2.09.33_PM Screenshot_2024-10-21_at_2.03.29_PM
Screenshot_2024-10-21_at_2.09.48_PM Screenshot_2024-10-21_at_2.03.46_PM
Screenshot_2024-10-21_at_2.09.15_PM Screenshot_2024-10-21_at_2.04.19_PM
Screenshot_2024-10-21_at_2.10.01_PM Screenshot_2024-10-21_at_2.04.32_PM
Screenshot_2024-10-21_at_2.10.17_PM Screenshot_2024-10-21_at_2.04.45_PM

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

Links

Edited by Annabel Dunstone Gray

Merge request reports