mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r912391 - in /websites/staging/mahout/trunk/content: ./ developers/github.html
Date Fri, 13 Jun 2014 00:28:35 GMT
Author: buildbot
Date: Fri Jun 13 00:28:34 2014
New Revision: 912391

Staging update by buildbot for mahout

    websites/staging/mahout/trunk/content/   (props changed)

Propchange: websites/staging/mahout/trunk/content/
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 13 00:28:34 2014
@@ -1 +1 @@

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 Fri Jun 13 00:28:34 2014
@@ -302,7 +302,14 @@ same time, it is recommended to use <str
-<p>Squash pull ensures all PR history is squashed into single commit, and allows committer
to use his/her own
+<p>If you are ready to merge your own (committer's) PR you probably only need to merge,
since you have a local copy that you've been working on. This is the branch that you used
to create the PR.</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
+<span class="n">git</span> <span class="n">merge</span> <span
class="o">--</span><span class="n">squash</span> <span class="n">cbranch</span>
# <span class="n">cbranch</span> <span class="n">here</span> <span
class="n">is</span> <span class="n">probably</span> <span class="n">named</span>
<span class="n">mahout</span><span class="o">-</span><span class="n">xxxx</span>
<span class="k">for</span> <span class="n">a</span> <span class="n">Jira</span>
<span class="n">ticket</span>
+<p>--squash ensures all PR history is squashed into single commit, and allows committer
to use his/her own
 message. Read git help for merge or pull for more information about <code>--squash</code>
option. In this example we assume that the contributor's Github handle is "cuser" and the
PR branch name is "cbranch". 
 Next, resolve conflicts, if any, or ask a contributor to rebase on top of master, if PR went
out of sync.</p>
 <p>Remember to run regular patch checks, build with tests enabled, and change CHANGELOG.</p>

View raw message