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 02:07:09 UTC
svn commit: r910180 - in /websites/staging/mahout/trunk/content: ./
developers/github.html
Author: buildbot
Date: Wed May 28 00:07:09 2014
New Revision: 910180
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 00:07:09 2014
@@ -1 +1 @@
-1597905
+1597906
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 00:07:09 2014
@@ -285,13 +285,10 @@ More information here [<a href="https://
<p>(this will require Apache handle credentials).</p>
-<div class="codehilite"><pre><span class="n">Note</span> <span class="n">on</span> <span class="n">squashing</span><span class="p">:</span> <span class="n">Since</span> <span class="n">squash</span> <span class="n">discards</span> <span class="n">remote</span> <span class="n">branch</span> <span class="n">history</span><span class="p">,</span> <span class="n">repeated</span> <span class="n">PRs</span> <span class="n">from</span> <span class="n">the</span> <span class="n">same</span> <span class="n">remote</span> <span class="n">branch</span> <span class="n">are</span>
-<span class="n">difficult</span> <span class="k">for</span> <span class="n">merging</span><span class="p">.</span> <span class="n">The</span> <span class="n">workflow</span> <span class="n">implies</span> <span class="n">that</span> <span class="n">every</span> <span class="n">new</span> <span class="n">PR</span> <span class="n">starts</span> <span class="n">with</span> <span class="n">a</span> <span class="n">new</span> <span class="n">rebased</span> <span class="n">branch</span><span class="p">.</span> <span class="n">This</span> <span class="n">is</span> <span class="n">more</span>
-<span class="n">important</span> <span class="k">for</span> <span class="n">contributors</span> <span class="n">to</span> <span class="n">know</span><span class="p">,</span> <span class="n">rather</span> <span class="n">than</span> <span class="k">for</span> <span class="n">committers</span><span class="p">,</span> <span class="n">because</span> <span class="k">if</span> <span class="n">new</span> <span class="n">PR</span> <span class="n">is</span> <span class="n">not</span> <span class="n">mergeable</span><span class="p">,</span> <span class="n">github</span>
-<span class="n">would</span> <span class="n">warn</span> <span class="n">to</span> <span class="n">begin</span> <span class="n">with</span><span class="p">.</span> <span class="n">Anyway</span><span class="p">,</span> <span class="n">watch</span> <span class="k">for</span> <span class="n">dupe</span> <span class="n">PRs</span> <span class="p">(</span><span class="n">based</span> <span class="n">on</span> <span class="n">same</span> <span class="n">source</span> <span class="n">branches</span><span class="p">).</span> <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">bad</span> <span class="n">practice</span><span class="p">.</span>
-</pre></div>
-
-
+<p><em>Note on squashing: Since squash discards remote branch history, repeated PRs from the same remote branch are
+difficult for merging. The workflow implies that every new PR starts with a new rebased branch. This is more
+important for contributors to know, rather than for committers, because if new PR is not mergeable, github
+would warn to begin with. Anyway, watch for dupe PRs (based on same source branches). This is a bad practice.</em></p>
<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>