Skip to content
Snippets Groups Projects
Commit 23f14e44 authored by Pradyumna's avatar Pradyumna
Browse files

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.
parent f981d4fe
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment