Improvements merging conflicts in the web-ui

How to Use GitLab
1

Problem to solve

I would like to merge a conflict branch using the web UI, but the inline merge window is very small.

Steps to reproduce

  • Create a branch
  • Create some changes in that branch
  • Create some conflicting changes in the main branch
  • Create a merge request on the branch to the main
  • Click on Resolve conflicts:
    image
    image921×261 20.5 KB
  • Click edit inline:
    image
  • The editor presented is very small, and does seem to be resizable, or maximizable to the full screen space:
    image
    image1270×667 58.6 KB

The ability to resolve conflicts on the web is very convenient, but for inline manual merge, a bigger or resizable screen would be better. Is there a way to change this?

Thanks a lot for such a great product!

Configuration

  • Standard

Versions