From 8bb4c6de5649f4ecc3970c48c45ec5e207c556c5 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Wed, 21 Mar 2012 23:59:12 +0200 Subject: [PATCH] improve how to merge tips --- app/views/merge_requests/_how_to_merge.html.haml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/merge_requests/_how_to_merge.html.haml b/app/views/merge_requests/_how_to_merge.html.haml index 5cf5e5bc..61b4f0aa 100644 --- 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