Draft: Clarify origin of changes in merge conflicts
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 |
---|---|
How to set up and validate locally
- If using the GDK with seeded data, visit
/gitlab-org/gitlab-test/-/merge_requests/9/diffs
- If using an empty instance:
- Make changes in a new branch and create an MR
- Edit the same lines in the target branch
- Visit the MR and select “Resolve conflicts” to view the conflict editor
Links
Edited by Annabel Dunstone Gray