diff options
| -rw-r--r-- | app/views/projects/merge_requests/_how_to_merge.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml index d3871453b9f..15499c89ffb 100644 --- a/app/views/projects/merge_requests/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/_how_to_merge.html.haml @@ -30,11 +30,13 @@ %pre.dark#merge-info-3 - if @merge_request.for_fork? :preserve - git checkout #{h @merge_request.target_branch} + git fetch origin + git checkout origin/#{h @merge_request.target_branch} git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} - else :preserve - git checkout #{h @merge_request.target_branch} + git fetch origin + git checkout origin/#{h @merge_request.target_branch} git merge --no-ff #{h @merge_request.source_branch} %p %strong Step 4. |