struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r983405 [2/2] - in /websites/production/struts/content: ./ docs/
Date Tue, 22 Mar 2016 08:06:48 GMT
Modified: websites/production/struts/content/submitting-patches.html
==============================================================================
--- websites/production/struts/content/submitting-patches.html (original)
+++ websites/production/struts/content/submitting-patches.html Tue Mar 22 08:06:48 2016
@@ -137,24 +137,32 @@
 
 <p>Now you can clone Struts repository locally</p>
 
-<pre><code>git clone https://git-wip-us.apache.org/repos/asf/struts.git    
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git clone https://git-wip-us.apache.org/repos/asf/struts.git
   
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <p>After cloning the repository locally you must initialize git-flow:</p>
 
-<pre><code> git flow init -d
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre> git flow init
-d
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <p>and done!</p>
 
-<p>Please remember that <code>master</code> branch cannot be modified directly
from now on!</p>
+<p>Please remember that <code class="highlighter-rouge"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>master<span
class="w">
+</span></pre></td></tr></tbody></table>
+</code> branch cannot be modified directly from now on!</p>
 
 <h2 id="non-committers">Non-committers</h2>
 
 <p>If you aren’t a committer you must use this link below or mirror at GitHub</p>
 
-<pre><code>git clone git://git.apache.org/struts.git struts-copy
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git clone git://git.apache.org/struts.git
struts-copy
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <h2 id="security-patches">Security patches</h2>
 
@@ -176,12 +184,16 @@ of Struts Comitters group.</p>
 go ahead and create one just right now! Please remember to setup
 <a href="https://help.github.com/articles/generating-ssh-keys">SSH keys</a> and
test them!</p>
 
-<p>When ready go to <a href="https://github.com/apache/struts">https://github.com/apache/struts</a>
and click <code>Fork</code> button
+<p>When ready go to <a href="https://github.com/apache/struts">https://github.com/apache/struts</a>
and click <code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>Fork<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> button
 in top right corner. This will fork Apache Struts repository and will create your private
(but public) repository
 with the source code.</p>
 
 <p>Next step is to clone your repo locally, information how to do this you will find
on right sidebar of your repo
-under <code>SSH clone URL</code> headline.</p>
+under <code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>SSH clone URL<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> headline.</p>
 
 <p>Now you are ready to work with Apache Struts code base. Perform your changes, commit
them and
 next push to GitHub! Remember: commit in Git is different than commit in Subversion!</p>
@@ -191,10 +203,14 @@ mirror - <a href="https://github.com/apa
 <a href="https://github.com/apache/struts/pulls">Pull request</a> and hit
 <a href="https://github.com/apache/struts/compare/">New Pull Request</a> button.</p>
 
-<p>If not already selected, click on <code>compare across forks.</code>
Right now you must select from the dropdowns on right
+<p>If not already selected, click on <code class="highlighter-rouge"><table
style="border-spacing: 0"><tbody><tr><td class="gutter gl" style="text-align:
right"><pre class="lineno">1</pre></td><td class="code"><pre>compare
across forks.<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> Right now you must select from the dropdowns on right
 your fork and branch to compare the differences with Apache Struts develop branch.</p>
 
-<p>Finally hit <code>Create Pull Request</code> button and you are done!</p>
+<p>Finally hit <code class="highlighter-rouge"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>Create Pull Request<span
class="w">
+</span></pre></td></tr></tbody></table>
+</code> button and you are done!</p>
 
 <h3 id="how-to-merge-pull-requests">How to merge Pull Requests</h3>
 
@@ -203,44 +219,69 @@ is read-only, we (committers) have limit
 
 <p>To merge PR please add GitHub as a new remote to your local copy</p>
 
-<pre><code>git remote add github git@github.com:apache/struts.git
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git remote add
github git@github.com:apache/struts.git
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <p>then you can fetch the PR localy and put it under a branch</p>
 
-<pre><code>git fetch github pull/28/head:some-branch    
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git fetch github
pull/28/head:some-branch    
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <p>where</p>
 
 <ul>
-  <li><code>github</code> is remote name</li>
-  <li><code>28</code> is Pull Request id (https://github.com/apache/struts/pull/28)</li>
-  <li><code>some-branch</code> local branch name, it can be the same as
used to create the PR</li>
+  <li><code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>github<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> is remote name</li>
+  <li><code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>28<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> is Pull Request id (https://github.com/apache/struts/pull/28)</li>
+  <li><code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>some-branch<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> local branch name, it can be the same as used to create the PR</li>
 </ul>
 
 <p>now you can switch to this branch and test, review it</p>
 
-<pre><code>git checkout some-branch
-</code></pre>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git checkout some-branch
+</pre></td></tr></tbody></table>
+</div>
+</div>
+
+<p>after reviewing, switch back to the <code class="highlighter-rouge"><table
style="border-spacing: 0"><tbody><tr><td class="gutter gl" style="text-align:
right"><pre class="lineno">1</pre></td><td class="code"><pre>develop<span
class="w">
+</span></pre></td></tr></tbody></table>
+</code> branch and merge</p>
 
-<p>after reviewing, switch back to the <code>develop</code> branch and
merge</p>
-
-<pre><code>git checkout develop
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1
+2</pre></td><td class="code"><pre>git checkout develop
 git merge some-branch -m "WW-XXXX Merges #28 which resolves ..."
-</code></pre>
-
-<p>using <code>-m</code> you can define your own merge message, it’s
a good way to link merge commit with ticket in JIRA</p>
-
-<pre><code>git branch -d some-branch
-</code></pre>
+</pre></td></tr></tbody></table>
+</div>
+</div>
+
+<p>using <code class="highlighter-rouge"><table style="border-spacing: 0"><tbody><tr><td
class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td
class="code"><pre>-m<span class="w">
+</span></pre></td></tr></tbody></table>
+</code> you can define your own merge message, it’s a good way to link merge commit
with ticket in JIRA</p>
+
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git branch -d
some-branch
+</pre></td></tr></tbody></table>
+</div>
+</div>
 
 <p>remove the branch as it isn’t needed anymore</p>
 
-<pre><code>git push
-</code></pre>
-
-<p>after pushing changes, <code>asfbot</code> will close the PR at GitHub.
</p>
+<div class="highlighter-rouge"><div class="highlight"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>git push
+</pre></td></tr></tbody></table>
+</div>
+</div>
+
+<p>after pushing changes, <code class="highlighter-rouge"><table style="border-spacing:
0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre
class="lineno">1</pre></td><td class="code"><pre>asfbot<span
class="w">
+</span></pre></td></tr></tbody></table>
+</code> will close the PR at GitHub.</p>
 
 <h2 id="further-reading">Further reading</h2>
 



Mime
View raw message