Erroneous merge conflicts (0 of 0 conflicts resolved)
Ran into this after rebasing on master for a pending MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5585#note_14445492
Any ideas what might be causing this?
Ran into this after rebasing on master for a pending MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5585#note_14445492
Any ideas what might be causing this?