diff options
| author | Pradyumna <pradyumna2905@gmail.com> | 2018-08-29 21:50:00 -0700 |
|---|---|---|
| committer | Pradyumna <pradyumna2905@gmail.com> | 2018-08-29 22:00:38 -0700 |
| commit | 23f14e442cab09b3ebb9f2ba4f76a9272c8ff0e5 (patch) | |
| tree | 7ad044fcd119f75c6bd14bb5e0c86bddff1690a1 /app/views/projects/merge_requests | |
| parent | f981d4febbbb5103262f4daa858236d9c4ed9d67 (diff) | |
| download | gitlab-ce-23f14e442cab09b3ebb9f2ba4f76a9272c8ff0e5.tar.gz | |
Updates hint text for merging branches locally.
- Hint essentially states that a user should first update their target branch
with upstream changes and then perform the merge.
Diffstat (limited to 'app/views/projects/merge_requests')
| -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. |