Error 500 while attempting to resolve conflicts due to UTF-8 conversion error
https://sentry.gitlap.com/gitlab/gitlabcom/issues/155814/
Encoding::UndefinedConversionError: "\xE2" from ASCII-8BIT to UTF-8
app/controllers/projects/merge_requests/conflicts_controller.rb:37:in `conflict_for_path'
render json: file, full_content: true
lib/gitlab/i18n.rb:50:in `with_locale'
yield
lib/gitlab/i18n.rb:56:in `with_user_locale'
with_locale(user&.preferred_language, &block)
app/controllers/application_controller.rb:338:in `set_locale'
Gitlab::I18n.with_user_locale(current_user, &block)
lib/gitlab/middleware/multipart.rb:95:in `call'
return @app.call(env) if encoded_message.blank?
...
(146 additional frame(s) were not displayed)
Encoding::UndefinedConversionError: "\xE2" from ASCII-8BIT to UTF-8