Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
Attach a file by drag & drop or click to upload
