<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=491263) </details> <!--IssueSummary end--> ### Summary A merge conflict upon the simultaneous edit of a file in the single file editor used to elicit the error: `Someone edited the file the same time you did. Please check out %{link_start}the file %{icon}%{link_end } and make sure your changes will not unintentionally remove theirs.` But now only the following is shown: `An error occurred editing the blob` which is much less helpful. ### Steps to reproduce Using the single page editor, edit the same file under two different accounts. Error occurs upon saving. ### What is the current *bug* behavior? A less useful error message is presented. Note that the former error message is still in the code. ### What is the expected *correct* behavior? The more helpful message should be rendered. ### Output of checks This bug happens on GitLab.com #### Results of GitLab environment info ### Possible fixes This is a regression most likely caused in !137641 by introduction of a [catch](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/javascripts/blob_edit/edit_blob.js#L119-121) that bypasses the former error handling in the [view code](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/views/projects/blob/edit.html.haml#L6-19).