...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
.modal-body .modal-body
%pre %pre
:erb :erb
git fetch origin
git checkout -b <%=@merge_request.source_branch%> origin/<%=@merge_request.source_branch%>
git checkout <%= @merge_request.target_branch %> git checkout <%= @merge_request.target_branch %>
git merge <%=@merge_request.source_branch%> git fetch origin
git merge origin/<%= @merge_request.source_branch %>
git push origin <%= @merge_request.target_branch %> git push origin <%= @merge_request.target_branch %>
... ...
......