You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by bu...@apache.org on 2014/05/28 20:11:55 UTC
svn commit: r910286 - in /websites/staging/mahout/trunk/content: ./
developers/github.html
Author: buildbot
Date: Wed May 28 18:11:55 2014
New Revision: 910286
Log:
Staging update by buildbot for mahout
Modified:
websites/staging/mahout/trunk/content/ (props changed)
websites/staging/mahout/trunk/content/developers/github.html
Propchange: websites/staging/mahout/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May 28 18:11:55 2014
@@ -1 +1 @@
-1597908
+1598096
Modified: websites/staging/mahout/trunk/content/developers/github.html
==============================================================================
--- websites/staging/mahout/trunk/content/developers/github.html (original)
+++ websites/staging/mahout/trunk/content/developers/github.html Wed May 28 18:11:55 2014
@@ -253,7 +253,7 @@ pushing it to https://git-wip-us.apache.
<p>Start with reading [<a href="https://help.github.com/articles/merging-a-pull-request#merging-locally">2</a>] (merging locally). </p>
<p>Remember that pull requests are equivalent to a remote github branch with potentially a multitude of commits.
In this case it is recommended to squash remote commit history to have one commit per issue, rather
-than merging in a multitude of contributer's commits. In order to do that, as well as close the PR at the
+than merging in a multitude of contributor's commits. In order to do that, as well as close the PR at the
same time, it is recommended to use <strong>squash commits</strong>.</p>
<p>Merging pull requests are equivalent to merging contributor's branch:</p>
<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">master</span> # <span class="k">switch</span> <span class="n">to</span> <span class="n">local</span> <span class="n">master</span> <span class="n">branch</span>
@@ -274,12 +274,12 @@ message. Read git help for merge or pull
<p>Next, resolve conflicts, if any, or ask contributor to rebase on top of master, if PR went out of sync.</p>
<p>Also run regular patch checks and change CHANGELOG.</p>
<p>Suppose everything is fine, you now can commit the squashed request along the lines</p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">commit</span> <span class="o">-</span><span class="n">a</span> <span class="o">-</span><span class="n">m</span> "<span class="n">MAHOUT</span><span class="o">-</span><span class="n">YYYY</span> <span class="n">description</span> <span class="p">(</span><span class="n">cuser</span> <span class="n">via</span> <span class="n">ssc</span><span class="p">)</span> <span class="o">**</span><span class="n">closes</span> #<span class="n">ZZ</span><span class="o">**</span>"
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">commit</span> <span class="o">-</span><span class="n">a</span> <span class="o">-</span><span class="n">m</span> "<span class="n">MAHOUT</span><span class="o">-</span><span class="n">YYYY</span> <span class="n">description</span> <span class="p">(</span><span class="n">cuser</span> <span class="n">via</span> <span class="n">ssc</span><span class="p">)</span> <span class="n">closes</span> <span class="n">apache</span><span class="o">/</span><span class="n">mahout</span>#<span class="n">ZZ</span>"
</pre></div>
-<p>where <code>ZZ</code> is the pull request number. Including "closes #ZZ" will close PR automatically.
-More information here [<a href="https://help.github.com/articles/closing-issues-via-commit-messages">3</a>].</p>
+<p>where <code>ZZ</code> is the pull request number on apache/mahout repository. Including "closes #ZZ" will close PR
+automatically. More information is found here [<a href="https://help.github.com/articles/closing-issues-via-commit-messages">3</a>].</p>
<p>Next, push to git-wip-us.a.o:</p>
<div class="codehilite"><pre><span class="n">push</span> <span class="n">apache</span> <span class="n">master</span>
</pre></div>
@@ -293,7 +293,7 @@ would warn to begin with. Anyway, watch
<h2 id="closing-a-pr-without-committing-for-committers">Closing a PR without committing (for committers)</h2>
<p>When we want to reject a PR (close without committing), we can just issue an empty commit on master's HEAD
<em>without merging the PR</em>: </p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">commit</span> <span class="o">--</span><span class="n">allow</span><span class="o">-</span><span class="n">empty</span> <span class="o">-</span><span class="n">m</span> "<span class="n">closes</span> #<span class="n">ZZ</span> <span class="o">*</span><span class="n">Won</span><span class="o">'</span><span class="n">t</span> <span class="nb">fix</span><span class="o">*</span>"
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">commit</span> <span class="o">--</span><span class="n">allow</span><span class="o">-</span><span class="n">empty</span> <span class="o">-</span><span class="n">m</span> "<span class="n">closes</span> <span class="n">apache</span><span class="o">/</span><span class="n">mahout</span>#<span class="n">ZZ</span> <span class="o">*</span><span class="n">Won</span><span class="o">'</span><span class="n">t</span> <span class="nb">fix</span><span class="o">*</span>"
<span class="n">git</span> <span class="n">push</span> <span class="n">apache</span> <span class="n">master</span>
</pre></div>