Download as
Browse Code »

Commit 8bb4c6de5649f4ecc3970c48c45ec5e207c556c5

Authored by Valery Sizov
1 parent b57faf92
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @8bb4c6d
... ... @@ -5,11 +5,10 @@
5 5 .modal-body
6 6 %pre
7 7 :erb
  8 + git checkout <%= @merge_request.target_branch %>
8 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 14 :javascript
... ...