Skip to content

Adjust border radius of collapsed conflicted file

Annabel Dunstone Gray requested to merge collapsed-conflicted-file into master

What does this MR do and why?

  • Removes rounded border radius of merge conflict file header when collapsed, to align better with alert underneath
  • Should not affect files without conflicts

Screenshots or screen recordings

Before After
Screenshot_2024-04-09_at_12.20.38_PM Screenshot_2024-04-09_at_12.16.32_PM

How to set up and validate locally

  • To to MR with merge conflicts
  • Collapse files

Links

Edited by Annabel Dunstone Gray

Merge request reports