diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-23 16:37:14 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 08:27:08 +0100 |
| commit | 44eb3197a9c30503a00384b3d688b64558b80397 (patch) | |
| tree | 852391adf4834d2ef8cc6a53e173e93c5b533c9b /doc/user | |
| parent | b2bf01f4c271be66e93ed6f4b48a1da4d50e558d (diff) | |
| download | gitlab-ce-44eb3197a9c30503a00384b3d688b64558b80397.tar.gz | |
Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/resolve_conflicts.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md index 44b76ffc8e6..4d7225bd820 100644 --- a/doc/user/project/merge_requests/resolve_conflicts.md +++ b/doc/user/project/merge_requests/resolve_conflicts.md @@ -26,6 +26,7 @@ this is similar to performing `git checkout feature; git merge master` locally. GitLab allows resolving conflicts in a file where all of the below are true: - The file is text, not binary +- The file is in a UTF-8 compatible encoding - The file does not already contain conflict markers - The file, with conflict markers added, is not over 200 KB in size - The file exists under the same path in both branches |