Commit 8bb4c6de5649f4ecc3970c48c45ec5e207c556c5
1 parent
b57faf92
Exists in
master
and in
4 other branches
improve how to merge tips
Showing
1 changed file
with
3 additions
and
4 deletions
Show diff stats
app/views/merge_requests/_how_to_merge.html.haml
| @@ -5,11 +5,10 @@ | @@ -5,11 +5,10 @@ | ||
| 5 | .modal-body | 5 | .modal-body |
| 6 | %pre | 6 | %pre |
| 7 | :erb | 7 | :erb |
| 8 | + git checkout <%= @merge_request.target_branch %> | ||
| 8 | git fetch origin | 9 | git fetch origin |
| 9 | - git checkout -b <%=@merge_request.source_branch%> origin/<%=@merge_request.source_branch%> | ||
| 10 | - git checkout <%=@merge_request.target_branch%> | ||
| 11 | - git merge <%=@merge_request.source_branch%> | ||
| 12 | - git push origin <%=@merge_request.target_branch%> | 10 | + git merge origin/<%= @merge_request.source_branch %> |
| 11 | + git push origin <%= @merge_request.target_branch %> | ||
| 13 | 12 | ||
| 14 | 13 | ||
| 15 | :javascript | 14 | :javascript |