Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 16:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update merge guide

Browse Source
This commit is contained in:
Naoki Takezoe
2015-08-16 23:43:57 +09:00
parent dc26fcf609
commit 89fc143075
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -83,14 +83,15 @@
} }
<div> <div>
<p> <p>
<span class="strong">Step 1:</span> Check out a new branch to test the changes — run this from your project directory <span class="strong">Step 1:</span> From your project repository, check out a new branch and test the changes.
</p> </p>
@defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}"){ command => @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\ngit pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
@helper.html.copy("merge-command-copy-1", command){ @helper.html.copy("merge-command-copy-1", command){
<pre style="width: 500px; float: left;">@command</pre> <pre style="width: 500px; float: left;">@command</pre>
} }
} }
</div> </div>
@*
<div> <div>
<p> <p>
<span class="strong">Step 2:</span> Bring in @{pullreq.requestUserName}'s changes and test <span class="strong">Step 2:</span> Bring in @{pullreq.requestUserName}'s changes and test
@@ -101,12 +102,13 @@
} }
} }
</div> </div>
*@
<div> <div>
<p> <p>
<span class="strong">Step 3:</span> Merge the changes and update the server <span class="strong">Step 2:</span> Merge the changes and update on the server.
</p> </p>
@defining(s"git checkout ${pullreq.branch}\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command => @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
@helper.html.copy("merge-command-copy-3", command){ @helper.html.copy("merge-command-copy-2", command){
<pre style="width: 500px; float: left;">@command</pre> <pre style="width: 500px; float: left;">@command</pre>
} }
} }