Skip to content

Parse conflict lines with CRLF endings correctly

Patrick Bajao requested to merge 365343-parse-conflicts-crlf into master

What does this MR do and why?

When lines have CRLF endings, GitLab is not able to parse them correctly as we match the conflict markers after we delete the newline character. That only deletes the LF and keep the CR.

To fix it, we also delete the CR before we match the conflict markers.

How to set up and validate locally

Follow the steps in #365343 (closed).

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Related to #365343 (closed)

Merge request reports