Skip to content
Snippets Groups Projects

Release 9.3 RC2 EE diff

As part of 9.3 RC2, I am trying to do the following task:

I did following steps;

  1. Created new branch 9-3-stable-ee-rc2 from https://gitlab.com/gitlab-org/gitlab-ee/commit/86051969bd10f2c75540add61424aa12bb21e265
  2. Tried merging 9-3-stable-ee-rc2 into 9-3-stable-ee locally using following command;
  • git merge -Xtheirs 9-3-stable-ee-rc2

And then I ran into conflicts for following files, where these files were deleted from 9-3-stable-rc2 (which is master till https://gitlab.com/gitlab-org/gitlab-ee/commit/86051969bd10f2c75540add61424aa12bb21e265 commit) but are present in 9-3-stable (which is 9.2.5-ee + https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10885 at the time of writing this)

  • app/assets/javascripts/issue_show/issue_title_description.vue
  • app/assets/javascripts/projects/settings_service_desk/service_desk_root.js
  • app/workers/geo_backfill_worker.rb
  • spec/javascripts/commit/pipelines/mock_data.js
  • spec/javascripts/issue_show/issue_title_description_spec.js
  • spec/support/wait_for_vue_resource.rb
  • spec/workers/geo/geo_backfill_worker_spec.rb
  • spec/workers/repository_update_mirror_dispatch_worker_spec.rb
Edited by kushalpandya