Added warning to diff files when there are conflicts See merge request gitlab-org/gitlab!67216
Attach a file by drag & drop or click to upload
