Author: buildbot
Date: Thu Jun 5 19:29:04 2014
New Revision: 911480
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 Thu Jun 5 19:29:04 2014
@@ -1 +1 @@
-1600732
+1600736
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 Thu Jun 5
19:29:04 2014
@@ -273,6 +273,9 @@ pushing it to https://git-wip-us.apache.
<p>For most non-trivial work it's best to use a PR so go to your github
account, pick the branch you want to push and create a pull request. Github
will ask for the "base fork:" this should be github's apache/mahout , and the
"base:" should be "master". This will create a pull request for review on
gtihub. Once the review is complete proceed to merging below.</p>
+<h2 id="prs-for-collaboration">PR's For Collaboration</h2>
+<p>Creating a PR is also useful when you want to collaborate on something.
Even though the PR will never be merged with the master branch it is perfectly
acceptable to submit one so another committer can grab it and contribute or
comment. Just make sure to note that it is not meant for merging. Typically you
will merge your own PRs so this won't be a problem. Another way to do this
would be to create a branch on the main
+Apache git remote but this will soon clutter the repo with lots of temporary
branches that might be better handled through the PR mechanism.</p>
<h2 id="merging-a-pr-and-closing-it-for-committers">Merging a PR and closing
it (for committers)</h2>
<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.
