Skip to content
Snippets Groups Projects

Parse conflict lines with CRLF endings correctly

Merged Patrick Bajao requested to merge 365343-parse-conflicts-crlf into master
All threads resolved!

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Tarun Vellishetty requested review from @dskim_gitlab and removed review request for @tvellishetty

    requested review from @dskim_gitlab and removed review request for @tvellishetty

  • Tarun Vellishetty approved this merge request

    approved this merge request

  • :wave: @tvellishetty, thanks for approving this merge request.

    This is the first time the merge request is approved. To ensure full test coverage, a new pipeline has been started.

    For more info, please refer to the following links:

  • Sincheol (David) Kim removed review request for @dskim_gitlab

    removed review request for @dskim_gitlab

  • Sincheol (David) Kim
  • Patrick Bajao added 417 commits

    added 417 commits

    Compare with previous version

  • Patrick Bajao requested review from @dskim_gitlab

    requested review from @dskim_gitlab

  • Sincheol (David) Kim approved this merge request

    approved this merge request

  • Sincheol (David) Kim resolved all threads

    resolved all threads

  • mentioned in commit 17fa4f9c

  • added workflowstaging label and removed workflowcanary label

  • Please register or sign in to reply
    Loading