Conflicts resolution for 10.2-stable-rc1 [CE into EE]
Conflicts generated when merging 10-2-stable-prepare-rc1
into 10-2-stable-ee-prepare-rc1
.
-
@yorickpeterse lib/gitlab/github_import/client.rb
-
@felipe_artur spec/services/merge_requests/merge_service_spec.rb
Guys, could you take a look on those conflicts please? It's blocking 10.2-rc1
.
Edited by Michael Kozono