Commit f4d04ee9 authored by Sean McGivern's avatar Sean McGivern

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
parents 8479b3b6 23f14e44
...@@ -30,11 +30,13 @@ ...@@ -30,11 +30,13 @@
%pre.dark#merge-info-3 %pre.dark#merge-info-3
- if @merge_request.for_fork? - if @merge_request.for_fork?
:preserve :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} git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch}
- else - else
:preserve :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} 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