mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r910171 - in /websites/staging/mahout/trunk/content: ./ developers/github.html
Date Tue, 27 May 2014 22:06:38 GMT
Author: buildbot
Date: Tue May 27 22:06:37 2014
New Revision: 910171

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 Tue May 27 22:06:37 2014
@@ -1 +1 @@
-1597890
+1597891

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 Tue May 27 22:06:37 2014
@@ -250,7 +250,7 @@
 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 
 same time, it is recommended to use <strong>squash commits</strong>.</p>
-<p>Read [[2]] (merging locally). Merging pull requests are equivalent to merging contributor's
branch:</p>
+<p>Read [<a href="https://help.github.com/articles/merging-a-pull-request#merging-locally">2</a>]
(merging locally). 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>
 <span class="n">git</span> <span class="n">pull</span> <span class="n">apache</span>
<span class="n">master</span>   # <span class="n">fast</span><span
class="o">-</span><span class="n">forward</span> <span class="n">to</span>
<span class="n">current</span> <span class="n">remote</span> <span
class="n">HEAD</span>
 <span class="n">git</span> <span class="n">pull</span> <span class="o">--</span><span
class="n">squash</span> <span class="n">https</span><span class="p">:</span><span
class="o">//</span><span class="n">github</span><span class="p">.</span><span
class="n">com</span><span class="o">/</span><span class="n">cuser</span><span
class="o">/</span><span class="n">mahout</span> <span class="n">cbranch</span>
 # <span class="n">merge</span> <span class="n">to</span> <span
class="n">master</span>
@@ -274,7 +274,7 @@ fast forward is possible, so you get cha
 
 
 <p>edit message to contain "MAHOUT-YYYY description <strong>closes #ZZ</strong>",
where ZZ is the pull request number. 
-Including "closes #ZZ" will close PR automatically. More information [[3]].</p>
+Including "closes #ZZ" will close PR automatically. More information [<a href="https://help.github.com/articles/closing-issues-via-commit-messages">3</a>].</p>
 <p>push apache master</p>
 <p>(this will require credentials).</p>
 <p>Note on squashing: Since squash discards remote branch history, repeated PRs from
the same remote branch are 
@@ -291,7 +291,7 @@ would warn to begin with. Anyway, watch 
 
 <p>that should close PR without merging and any code modifications in the master repository.</p>
 <h2 id="apachegithub-integration-features">Apache/github integration features</h2>
-<p>Read [[4]]. Issue handles mentioned in comments and PR name should post to mailing
lists and Jira.</p>
+<p>Read [<a href="https://blogs.apache.org/infra/entry/improved_integration_between_apache_and">4</a>].
Issue handles mentioned in comments and PR name should post to mailing lists and Jira.</p>
    </div>
   </div>     
 </div> 



Mime
View raw message