deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

improve how to merge tips

Browse source
This commit is contained in:
Valery Sizov 2012-03-21 23:59:12 +02:00
parent b57faf9282
commit 8bb4c6de56
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/merge_requests/_how_to_merge.html.haml
View file

@ -5,11 +5,10 @@
.modal-body .modal-body
%pre %pre
:erb :erb
git checkout <%= @merge_request.target_branch %>
git fetch origin 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 :javascript