Skip to content

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

What does this MR do?

Fixes a bug.

Are there points in the code the reviewer needs to double check?

The interface isn't super nice here, but I wanted to make a fairly minimal change. The comment explains why we can't just record that we already encoded the content, unless we also need to change the stitcher.

Why was this MR needed?

It's a bug caused by a side-effect no longer happening.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Tests added for this feature/bug
  • Review
    • Has been reviewed by Backend

What are the relevant issue numbers?

Closes #44564 (closed).

Edited by Sean McGivern

Merge request reports