You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/04/22 08:50:26 UTC
svn commit: r986316 - in /websites/production/struts/content: favicon.ico
submitting-patches.html
Author: lukaszlenart
Date: Fri Apr 22 06:50:26 2016
New Revision: 986316
Log:
Updates production
Added:
websites/production/struts/content/favicon.ico (with props)
Modified:
websites/production/struts/content/submitting-patches.html
Added: websites/production/struts/content/favicon.ico
==============================================================================
Binary file - no diff available.
Propchange: websites/production/struts/content/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: websites/production/struts/content/submitting-patches.html
==============================================================================
--- websites/production/struts/content/submitting-patches.html (original)
+++ websites/production/struts/content/submitting-patches.html Fri Apr 22 06:50:26 2016
@@ -122,34 +122,16 @@
<h2 id="committers">Committers</h2>
-<p>Struts uses Git and to manage the repository the git-flow was adopted, to read more about that please follow the links below:</p>
-
-<ul>
- <li><a href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a></li>
- <li><a href="https://github.com/petervanderdoes/gitflow">https://github.com/petervanderdoes/gitflow</a></li>
-</ul>
-
-<p>First step is to install git-flow AVH Edition locally on your box, please follow the steps from this link</p>
-
-<ul>
- <li><a href="https://github.com/petervanderdoes/gitflow/wiki">https://github.com/petervanderdoes/gitflow/wiki</a></li>
-</ul>
-
-<p>Now you can clone Struts repository locally</p>
+<p>Struts uses Git so you must install git client locally and then you can clone Struts repository:</p>
<div class="highlighter-rouge"><pre class="highlight"><code>git clone https://git-wip-us.apache.org/repos/asf/struts.git
</code></pre>
</div>
-<p>After cloning the repository locally you must initialize git-flow:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code> git flow init -d
-</code></pre>
-</div>
-
<p>and done!</p>
-<p>Please remember that <code class="highlighter-rouge">master</code> branch cannot be modified directly from now on!</p>
+<p>Please remember that <code class="highlighter-rouge">master</code> branch should be used only for small fast commits, if you are working on a large
+change it is better to do it on dedicated branch or even via GitHub.</p>
<h2 id="non-committers">Non-committers</h2>
@@ -163,8 +145,8 @@
<p><strong>Please read carefully, this is very important!</strong></p>
-<p>If you prepared a patch to solve security issue in Apache Struts, in the first step contact us via
-<a href="mailto:security@struts.apache.org">Security Mailing List</a>. Donât publish any information about possible vulnerability.
+<p>If you prepared a patch to solve security issue in the Apache Struts, in the first step contact us via
+<a href="mailto:security@struts.apache.org">Security Mailing List</a>. <strong>Donât publish any information about possible vulnerability</strong>.
Thus will allow us coordinate the work and review if the information about issue can be disclosed publicly.
We donât want to inform hackers before we can protect our users :-)</p>
@@ -172,30 +154,30 @@ We donât want to inform hackers bef
<h2 id="contributing-with-github">Contributing with GitHub</h2>
-<p>Using GitHub mirror is the simplest way to contribute to Apache Struts if you are not a member
-of Struts Comitters group.</p>
+<p>Using GitHub mirror is the simplest way to contribute to the Apache Struts if you are not a member
+of Struts Committers group.</p>
<p>First you must have an account created at GitHub to be able perform the next step. If you donât,
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 class="highlighter-rouge">Fork</code> button
-in top right corner. This will fork Apache Struts repository and will create your private (but public) repository
+in top right corner. This will fork the 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 class="highlighter-rouge">SSH clone URL</code> headline.</p>
-<p>Now you are ready to work with Apache Struts code base. Perform your changes, commit them and
+<p>Now you are ready to work with the 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>
-<p>With your changes pushed to GitHub you can prepare a Pull Request (short: PR). Go to Apache Struts
+<p>With your changes pushed to GitHub you can prepare a Pull Request (short: PR). Go to the Apache Struts
mirror - <a href="https://github.com/apache/struts">https://github.com/apache/struts</a> - then to
<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 class="highlighter-rouge">compare across forks.</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>
+your fork and branch to compare the differences with the Apache Strutsâ <code class="highlighter-rouge">master</code> branch.</p>
<p>Finally hit <code class="highlighter-rouge">Create Pull Request</code> button and you are done!</p>
@@ -210,7 +192,7 @@ is read-only, we (committers) have limit
</code></pre>
</div>
-<p>then you can fetch the PR localy and put it under a branch</p>
+<p>then you can fetch the PR locally and put it under a branch</p>
<div class="highlighter-rouge"><pre class="highlight"><code>git fetch github pull/28/head:some-branch
</code></pre>
@@ -230,9 +212,9 @@ is read-only, we (committers) have limit
</code></pre>
</div>
-<p>after reviewing, switch back to the <code class="highlighter-rouge">develop</code> branch and merge</p>
+<p>after reviewing, switch back to the <code class="highlighter-rouge">master</code> branch and merge</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>git checkout develop
+<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master
git merge some-branch -m "WW-XXXX Merges #28 which resolves ..."
</code></pre>
</div>