Author: pat
Date: Thu Jun 5 19:28:59 2014
New Revision: 1600736
URL: http://svn.apache.org/r1600736
Log:
CMS commit to mahout by pat
Modified:
mahout/site/mahout_cms/trunk/content/developers/github.mdtext
Modified: mahout/site/mahout_cms/trunk/content/developers/github.mdtext
URL:
http://svn.apache.org/viewvc/mahout/site/mahout_cms/trunk/content/developers/github.mdtext?rev=1600736&r1=1600735&r2=1600736&view=diff
==============================================================================
--- mahout/site/mahout_cms/trunk/content/developers/github.mdtext (original)
+++ mahout/site/mahout_cms/trunk/content/developers/github.mdtext Thu Jun 5
19:28:59 2014
@@ -53,6 +53,11 @@ Once you are ready to commit to the apac
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.
+## PR's For Collaboration
+
+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.
+
## Merging a PR and closing it (for committers)
Start with reading \[[2]\] (merging locally).
