44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml\unreleased\changelogs - delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

index : delta/gitlab/gitlab-ce.git

gitlab.com: gitlab-org/gitlab-ce.git

summary refs log tree commit diff

path: root/changelogs/unreleased/44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml

blob: 3fb96153b9cb95e6ab5d47c6c7df9d2e51b6ee12 (plain)

---
title: Fix 500 error when trying to resolve non-ASCII conflicts in the editor
merge_request: 17962
author:
type: fixed