diff --git a/app/views/merge_requests/_how_to_merge.html.haml b/app/views/merge_requests/_how_to_merge.html.haml index 5cf5e5bcb9c220c048cc2ced231d648b4b01bd67..61b4f0aa0a35e192e83ac755ae84bfebf2382033 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