changelogs/unreleased/44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml · 56b1e4c2ee20e860447f64efb2082c6fd6761ca3 · Forest Godfrey / gitlab-ce

BigW Consortium Gitlab

Merge branch… · ef28cab3

authored Mar 23, 2018

Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

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

Closes #44564

See merge request gitlab-org/gitlab-ce!17962

ef28cab3

44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml 123 Bytes