improve how to merge tips

diff --git a/app/views/merge_requests/_how_to_merge.html.haml b/app/views/merge_requests/_how_to_merge.html.haml
index 5cf5e5b..61b4f0a 100644 (file)
--- a/app/views/merge_requests/_how_to_merge.html.haml
+++ b/app/views/merge_requests/_how_to_merge.html.haml
@@ -5,11 +5,10 @@
   .modal-body
     %pre
       :erb
+        git checkout <%= @merge_request.target_branch %>
         git fetch origin
-        git checkout -b <%=@merge_request.source_branch%> origin/<%=@merge_request.source_branch%>
-        git checkout <%=@merge_request.target_branch%>
-        git merge <%=@merge_request.source_branch%>
-        git push origin <%=@merge_request.target_branch%>
+        git merge origin/<%= @merge_request.source_branch %>
+        git push origin <%= @merge_request.target_branch %>
 
 
 :javascript