Commit ba9fb625 authored by Tom Chiverton's avatar Tom Chiverton

Fixes main https://gitlab.com/gitlab-org/gitlab/-/issues/30430 by not creating detached head

parent 99df09ab
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
- if @merge_request.for_fork? - if @merge_request.for_fork?
:preserve :preserve
git fetch origin git fetch origin
git checkout "origin/#{h @merge_request.target_branch}" git checkout "#{h @merge_request.target_branch}"
git merge --no-ff "#{h @merge_request.source_project_path}-#{h @merge_request.source_branch}" git merge --no-ff "#{h @merge_request.source_project_path}-#{h @merge_request.source_branch}"
- else - else
:preserve :preserve
git fetch origin git fetch origin
git checkout "origin/#{h @merge_request.target_branch}" git checkout "#{h @merge_request.target_branch}"
git merge --no-ff "#{h @merge_request.source_branch}" git merge --no-ff "#{h @merge_request.source_branch}"
%p %p
%strong Step 4. %strong Step 4.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment