Commit 700eec66 authored by Kei Kubo's avatar Kei Kubo

added = preserve to some pre statements

parent 51ca0abf
...@@ -14,5 +14,6 @@ ...@@ -14,5 +14,6 @@
%p %p
Try: Try:
%pre %pre
sudo chmod -R 770 /home/git/repositories/ = preserve do
sudo chown -R git:git /home/git/repositories/ sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
%h3 How To Merge %h3 How To Merge
.modal-body .modal-body
%pre %pre
:erb = preserve do
git checkout <%= @merge_request.target_branch %> :erb
git fetch origin git checkout <%= @merge_request.target_branch %>
git merge origin/<%= @merge_request.source_branch %> git fetch origin
git push origin <%= @merge_request.target_branch %> git merge origin/<%= @merge_request.source_branch %>
git push origin <%= @merge_request.target_branch %>
:javascript :javascript
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment