Skip to content

Handle non-UTF-8 conflicts gracefully

Sean McGivern requested to merge 21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data into master

What does this MR do?

If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.

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

Is the regex the best way of doing this?

Why was this MR needed?

It's a bug in a new feature 😞

What are the relevant issue numbers?

Closes #21247 (closed).

Does this MR meet the acceptance criteria?

Merge request reports