<!-- This template is a great use for issues that are feature::additions or technical tasks for larger issues.--> ### Proposal <!-- Use this section to explain the feature and how it will work. It can be helpful to add technical details, design proposals, and links to related epics or issues. --> **Context:** We met with an active academia user of GitLab's community edition. They use GitLab extensively, including to capture documentation and meeting agendas and notes. **The problem:** When two people use the web UI to make updates to the same file and then try to merge their, non-conflicting, changes the web UI fails for them. **Request:** From the requester: "gitlab UI should handle merges in commits as it works from a console push. Merging is a core git competence; two non-conflicting edits to a file through the UI should be merged rather than failing." <!-- Consider adding related issues and epics to this issue. You can also reference the Feature Proposal Template (https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal%20-%20detailed.md) for additional details to consider adding to this issue. Additionally, as a data oriented organization, when your feature exits planning breakdown, consider adding the `What does success look like, and how can we measure that?` section. -->