Skip to content

Handle non-latin characters in the conflict resolve service

Marc Shaw requested to merge 427528-the-error-an-error-occurred-while-loading-the-file-happens-when-the-user-try-to-resolve into master

What does this MR do and why?

When receiving the file paths from gitaly for conflict files, we should encode these to utf-8 inorder to compare them later.

To Test:

  1. Create a project or use an existing project
  2. Add a file with a non-latin name (e.g.: テスト.txt) and commit to main
  3. Create another branch off of main (e.g.: test-branch)
  4. Edit and commit テスト.txt in the new branch test-branch
  5. Go back to the main branch; edit and commit テスト.txt to main to create a conflict
  6. Create a merge request from test-branch to main
  7. The MR will show that there are conflicts. Click the "Resolve Conflicts" button
  8. It should not allow you to resolve anything
  9. Switch to this branch
  10. Reload, and you should have the ability to resolve the conflict

Related to #427528 (closed)

Edited by Marc Shaw

Merge request reports