improve how to merge tips

8bb4c6de · Valery Sizov · b57faf92 · 8bb4c6de
Commit 8bb4c6de authored Mar 21, 2012 by Valery Sizov
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

app/views/merge_requests/_how_to_merge.html.haml app/views/merge_requests/_how_to_merge.html.haml +3 -4

No files found.
--- 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 merge origin/<%= @merge_request.source_branch %>
-        git checkout <%=@merge_request.target_branch%>
+        git push origin <%= @merge_request.target_branch %>
-        git merge <%=@merge_request.source_branch%>
-        git push origin <%=@merge_request.target_branch%>
 :javascript