Merge Request error "Unexpected conflict delimiter" from "Projects::MergeRequests::ConflictsController"
The following MR Update the support engineer interview process doc to include a link to the behavioural scorecard questions cannot be successfully merged because it is returning the message “Showing 1 conflict between jlyttle-master-patch-26432 and master”
When you attempt to resolve the conflict and select “commit to source branch” you encounter the error “Failed to save merge conflicts resolutions. Please try again!”
Upon further inspection within Sentry: https://sentry.gitlab.net/gitlab/gitlabcom/issues/2705260/ the following error is returned:
{"created":"@1625475275.879531304","description":"Error received from peer ipv4:10.221.2.112:9999","file":"src/core/lib/surface/call.cc","file_line":1055,"grpc_message":"resolve: parse conflict for "Engineering/Support/Support Engineer/Interview Process.md": unexpected conflict delimiter\n","grpc_status":2}
I have not attempted to debug the issue as I want to leave the problem within its original state so that R&D can debug. With this in mind can this issue be reviewed with the aim of:
- Identifying the root cause of the conflict
- Provide clarity regarding what steps should be implemented to debug this type of merge conflict