diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-30 08:42:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-30 08:42:20 +0000 |
| commit | f4d04ee9aaaead634543ee024d275f20edbe563e (patch) | |
| tree | 9664383ebd9f9a91f2512c6b13fb3888f89320f7 | |
| parent | 8479b3b6fc051c3bd31330403e202ec5c09808f0 (diff) | |
| parent | 23f14e442cab09b3ebb9f2ba4f76a9272c8ff0e5 (diff) | |
| download | gitlab-ce-f4d04ee9aaaead634543ee024d275f20edbe563e.tar.gz | |
Merge branch 'update-hint-for-local-merge' into 'master'
Updates hint text for merging branches locally.
Closes #39398
See merge request gitlab-org/gitlab-ce!21421
| -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. |