http://git-wip-us.apache.org/repos/asf/mahout/blob/5112e9ec/developers/github.html ---------------------------------------------------------------------- diff --git a/developers/github.html b/developers/github.html index 0ea9f59..2c00211 100644 --- a/developers/github.html +++ b/developers/github.html @@ -1,278 +1,144 @@ +<!DOCTYPE html> +<html lang=" en "> + +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <title> + Apache Mahout + + </title> + + <meta name="description" content="Distributed Linear Algebra"> + + <link rel="stylesheet" href="/assets/css/main.css"> + + <!-- Font Awesome --> + <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"; rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"> + + <!-- Google Fonts --> + <link href="https://fonts.googleapis.com/css?family=Maven+Pro:400,500"; rel="stylesheet"> + <link href="https://fonts.googleapis.com/css?family=Muli:400,400i,700,700i"; rel="stylesheet"> + + <link rel="canonical" href="http://mahout.apache.org//developers/github.html";> + <link rel="alternate" type="application/rss+xml" title="Apache Mahout" href="/%20/feed.xml"> -<!DOCTYPE html> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Apache Mahout: Scalable machine learning and data mining</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="Distribution" content="Global"> - <meta name="Robots" content="index,follow"> - <meta name="keywords" content="apache, apache hadoop, apache lucene, - business data mining, cluster analysis, - collaborative filtering, data extraction, data filtering, data framework, data integration, - data matching, data mining, data mining algorithms, data mining analysis, data mining data, - data mining introduction, data mining software, - data mining techniques, data representation, data set, datamining, - feature extraction, fuzzy k means, genetic algorithm, hadoop, - hierarchical clustering, high dimensional, introduction to data mining, kmeans, - knowledge discovery, learning approach, learning approaches, learning methods, - learning techniques, lucene, machine learning, machine translation, mahout apache, - mahout taste, map reduce hadoop, mining data, mining methods, naive bayes, - natural language processing, - supervised, text mining, time series data, unsupervised, web data mining"> - <link rel="shortcut icon" type="image/x-icon" href="https://mahout.apache.org/images/favicon.ico";> - <!--<script type="text/javascript" src="/js/prototype.js"></script>--> - <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/prototype/1.7.2.0/prototype.js";></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/effects.js"></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/search.js"></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/slides.js"></script> - - <link href="/assets/themes/mahout-retro/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="/assets/themes/mahout-retro/css/bootstrap-responsive.css" rel="stylesheet"> - <link rel="stylesheet" href="/assets/themes/mahout-retro/css/global.css" type="text/css"> - - <!-- mathJax stuff -- use `\(...\)` for inline style math in markdown --> - <script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - tex2jax: { - skipTags: ['script', 'noscript', 'style', 'textarea', 'pre'] - } - }); - MathJax.Hub.Queue(function() { - var all = MathJax.Hub.getAllJax(), i; - for(i = 0; i < all.length; i += 1) { - all[i].SourceElement().parentNode.className += ' has-jax'; - } - }); - </script> - <script type="text/javascript"> - var mathjax = document.createElement('script'); - mathjax.type = 'text/javascript'; - mathjax.async = true; - - mathjax.src = ('https:' == document.location.protocol) ? - 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' : - 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'; - - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(mathjax, s); - </script> </head> -<body id="home" data-twttr-rendered="true"> - <div id="wrap"> - <div id="header"> - <div id="logo"><a href="/"><img src="/assets/img/mahout-logo-brudman.png" alt="Logos for Mahout and Apache Software Foundation" /></a></div> - <div id="search"> - <form id="search-form" action="http://www.google.com/search"; method="get" class="navbar-search pull-right"> - <input value="http://mahout.apache.org"; name="sitesearch" type="hidden"> - <input class="search-query" name="q" id="query" type="text"> - <input id="submission" type="image" src="/assets/img/mahout-lupe.png" alt="Search" /> - </form> - </div> - - <div class="navbar navbar-inverse" style="position:absolute;top:133px;padding-right:0px;padding-left:0px;"> - <div class="navbar-inner" style="border: none; background: #999; border: none; border-radius: 0px;"> - <div class="container"> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <!-- <a class="brand" href="#">Apache Community Development Project</a> --> - <!--<div class="nav-collapse collapse">--> -<div class="collapse navbar-collapse" id="main-navbar"> - <ul class="nav navbar-nav"> - <!-- <li><a href="/">Home</a></li> --> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">General<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/general/downloads.html">Downloads</a> - <li><a href="/general/who-we-are.html">Who we are</a> - <li><a href="/general/mailing-lists,-irc-and-archives.html">Mailing Lists</a> - <li><a href="/general/release-notes.html">Release Notes</a> - <li><a href="/general/books-tutorials-and-talks.html">Books, Tutorials, Talks</a></li> - <li><a href="/general/powered-by-mahout.html">Powered By Mahout</a> - <li><a href="/general/professional-support.html">Professional Support</a> - <li class="divider"></li> - <li class="nav-header">Resources</li> - <li><a href="/general/reference-reading.html">Reference Reading</a> - <li><a href="/general/faq.html">FAQ</a> - <li class="divider"></li> - <li class="nav-header">Legal</li> - <li><a href="http://www.apache.org/licenses/";>License</a></li> - <li><a href="http://www.apache.org/security/";>Security</a></li> - <li><a href="/general/privacy-policy.html">Privacy Policy</a> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/developers/developer-resources.html">Developer resources</a></li> - <li><a href="/developers/version-control.html">Version control</a></li> - <li><a href="/developers/buildingmahout.html">Build from source</a></li> - <li><a href="/developers/issue-tracker.html">Issue tracker</a></li> - <li><a href="https://builds.apache.org/job/Mahout-Quality/"; target="_blank">Code quality reports</a></li> - <li class="divider"></li> - <li class="nav-header">Contributions</li> - <li><a href="/developers/how-to-contribute.html">How to contribute</a></li> - <li><a href="/developers/how-to-become-a-committer.html">How to become a committer</a></li> - <li><a href="/developers/gsoc.html">GSoC</a></li> - <li class="divider"></li> - <li class="nav-header">For committers</li> - <li><a href="/developers/how-to-update-the-website.html">How to update the website</a></li> - <li><a href="/developers/patch-check-list.html">Patch check list</a></li> - <li><a href="/developers/github.html">Handling Github PRs</a></li> - <li><a href="/developers/how-to-release.html">How to release</a></li> - <li><a href="/developers/thirdparty-dependencies.html">Third party dependencies</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mahout-Samsara<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/sparkbindings/home.html">Scala & Spark Bindings Overview</a></li> - <li><a href="/users/sparkbindings/faq.html">FAQ</a></li> - <li><a href="/users/flinkbindings/playing-with-samsara-flink.html">Flink Bindings Overview</a></li> - <li class="nav-header">Engines</li> - <li><a href="/users/sparkbindings/home.html">Spark</a></li> - <li><a href="/users/environment/h2o-internals.html">H2O</a></li> - <li><a href="/users/flinkbindings/flink-internals.html">Flink</a></li> - <li class="nav-header">References</li> - <li><a href="/users/environment/in-core-reference.html">In-Core Algebraic DSL Reference</a></li> - <li><a href="/users/environment/out-of-core-reference.html">Distributed Algebraic DSL Reference</a></li> - <li class="nav-header">Tutorials</li> - <li><a href="/users/sparkbindings/play-with-shell.html">Playing with Mahout's Spark Shell</a></li> - <li><a href="/users/environment/how-to-build-an-app.html">How to build an app</a></li> - <li><a href="/users/environment/classify-a-doc-from-the-shell.html">Building a text classifier in Mahout's Spark Shell</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Algorithms<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/basics/algorithms.html">List of algorithms</a> - <li class="nav-header">Distributed Matrix Decomposition</li> - <li><a href="/users/algorithms/d-qr.html">Cholesky QR</a></li> - <li><a href="/users/algorithms/d-ssvd.html">SSVD</a></li> - <li><a href="/users/algorithms/d-als.html">Distributed ALS</a></li> - <li><a href="/users/algorithms/d-spca.html">SPCA</a></li> - <li class="nav-header">Recommendations</li> - <li><a href="/users/algorithms/recommender-overview.html">Recommender Overview</a></li> - <li><a href="/users/algorithms/intro-cooccurrence-spark.html">Intro to cooccurrence-based<br/> recommendations with Spark</a></li> - <li class="nav-header">Classification</li> - <li><a href="/users/algorithms/spark-naive-bayes.html">Spark Naive Bayes</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">MapReduce Basics<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/basics/algorithms.html">List of algorithms</a> - <li><a href="/users/basics/quickstart.html">Overview</a> - <li class="divider"></li> - <li class="nav-header">Working with text</li> - <li><a href="/users/basics/creating-vectors-from-text.html">Creating vectors from text</a> - <li><a href="/users/basics/collocations.html">Collocations</a> - <li class="divider"></li> - <li class="nav-header">Dimensionality reduction</li> - <li><a href="/users/dim-reduction/dimensional-reduction.html">Singular Value Decomposition</a></li> - <li><a href="/users/dim-reduction/ssvd.html">Stochastic SVD</a></li> - <li class="divider"></li> - <li class="nav-header">Topic Models</li> - <li><a href="/users/clustering/latent-dirichlet-allocation.html">Latent Dirichlet Allocation</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mahout MapReduce<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="nav-header">Classification</li> - <li><a href="/users/classification/bayesian.html">Naive Bayes</a></li> - <li><a href="/users/classification/hidden-markov-models.html">Hidden Markov Models</a></li> - <li><a href="/users/classification/logistic-regression.html">Logistic Regression (Single Machine)</a></li> - <li><a href="/users/classification/partial-implementation.html">Random Forest</a></li> - <li class="nav-header">Classification Examples</li> - <li><a href="/users/classification/breiman-example.html">Breiman example</a></li> - <li><a href="/users/classification/twenty-newsgroups.html">20 newsgroups example</a></li> - <li><a href="/users/classification/bankmarketing-example.html">SGD classifier bank marketing</a></li> - <li><a href="/users/classification/wikipedia-classifier-example.html">Wikipedia XML parser and classifier</a></li> - <li class="nav-header">Clustering</li> - <li><a href="/users/clustering/k-means-clustering.html">k-Means</a></li> - <li><a href="/users/clustering/canopy-clustering.html">Canopy</a></li> - <li><a href="/users/clustering/fuzzy-k-means.html">Fuzzy k-Means</a></li> - <li><a href="/users/clustering/streaming-k-means.html">Streaming KMeans</a></li> - <li><a href="/users/clustering/spectral-clustering.html">Spectral Clustering</a></li> - <li class="nav-header">Clustering Commandline usage</li> - <li><a href="/users/clustering/k-means-commandline.html">Options for k-Means</a></li> - <li><a href="/users/clustering/canopy-commandline.html">Options for Canopy</a></li> - <li><a href="/users/clustering/fuzzy-k-means-commandline.html">Options for Fuzzy k-Means</a></li> - <li class="nav-header">Clustering Examples</li> - <li><a href="/users/clustering/clustering-of-synthetic-control-data.html">Synthetic data</a></li> - <li class="nav-header">Cluster Post processing</li> - <li><a href="/users/clustering/cluster-dumper.html">Cluster Dumper tool</a></li> - <li><a href="/users/clustering/visualizing-sample-clusters.html">Cluster visualisation</a></li> - <li class="nav-header">Recommendations</li> - <li><a href="/users/recommender/recommender-first-timer-faq.html">First Timer FAQ</a></li> - <li><a href="/users/recommender/userbased-5-minutes.html">A user-based recommender <br/>in 5 minutes</a></li> - <li><a href="/users/recommender/matrix-factorization.html">Matrix factorization-based<br/> recommenders</a></li> - <li><a href="/users/recommender/recommender-documentation.html">Overview</a></li> - <li><a href="/users/recommender/intro-itembased-hadoop.html">Intro to item-based recommendations<br/> with Hadoop</a></li> - <li><a href="/users/recommender/intro-als-hadoop.html">Intro to ALS recommendations<br/> with Hadoop</a></li> + +<body> + + <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout"> + + <div class="container"> + + <a class="navbar-brand" href="/"> + <img src="/assets/mahout-logo-blue.svg" alt=""> + </a> + + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + + <div class="collapse navbar-collapse" id="navbarSupportedContent"> + + <ul class="navbar-nav ml-auto"> + + <!-- Download --> + <li class="nav-item"> + <a class="nav-link" href="/downloads/">Download</a> + </li> + + <li class="nav-item"> + <a class="nav-link" href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a> + </li> + + <!-- Developers --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Developers</a> + <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> + <a class="dropdown-item" href="/developers/developer-resources.html">Developer Resources</a> + <a class="dropdown-item" href="/developers/buildingmahout/">Building Mahout from Source</a> + <a class="dropdown-item" href="/developers/issue-tracker/">Issues Tracking (JIRA)</a> + <!-- <a class="dropdown-item" href="/developers/patch-check-list/">Patch Check List</a> going to github template --> + <!-- <a class="dropdown-item" href="/developers/reference/">References</a> a lot of overlap with books, talks, etc. page --> + <a class="dropdown-item" href="/developers/release-notes/">Release Notes</a> + <!-- <a class="dropdown-item" href="/developers/thirdparty-dependencies/">Third Party Dependencies</a> is our site the reasonable place for this? --> + <!-- <a class="dropdown-item" href="/developers/version-control/">Version Control</a> --> + <div class="dropdown-divider"></div> + <h6 class="dropdown-header">How To's</h6> + <a class="dropdown-item" href="/developers/how-to-contribute/">How to Contribute</a> + <a class="dropdown-item" href="/developers/githubPRs/">Github PRs</a> + <a class="dropdown-item" href="/developers/how-to-become-a-committer/">How to Become a Committer</a> + <a class="dropdown-item" href="/developers/how-to-release/">How to Release</a> + <a class="dropdown-item" href="/developers/how-to-update-the-website/">How to Update the Website</a> + </div> + </li> + + <!-- Docs --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Docs</a> + <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> + <h6 class="dropdown-header">Release</h6> + <a class="dropdown-item" href="/docs/0.13.0">0.13.0</a> + <div class="dropdown-divider"></div> + <h6 class="dropdown-header">Latest Snapshot (Development)</h6> + <a class="dropdown-item" href="/docs/latest">0.13.1-SNAPSHOT</a> + </div> + </li> + + <!-- Community --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Community</a> + <div class="dropdown-menu dropdown-menu-right"> + <a class="dropdown-item" href="/community/history/">History of the Apache Mahout Project</a> + <a class="dropdown-item" href="/community/blogs/">Blog Posts About Mahout</a> + <a class="dropdown-item" href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a> + <!-- <a class="dropdown-item" href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> --> + <a class="dropdown-item" href="/community/buildingmahout/">Building Mahout</a> + <!-- <a class="dropdown-item" href="/community/faq/">FAQ</a> needs a lot of updating --> + <a class="dropdown-item" href="/community/gsoc/">GSoC</a> + <!-- Is OK- updated Map/Reduce verbage to reflect Samsara --> + <!-- <a class="dropdown-item" href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep them? --> + <!-- <a class="dropdown-item" href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links cleanedup - do we still want this even?--> + <a class="dropdown-item" href="/community/mailing-lists/">Mailing Lists</a> + <!-- Clean and pretty --> + <!-- <a class="dropdown-item" href="/community/powered-by-mahout/">Powered By Mahout</a> needs update --> + <a class="dropdown-item" href="/community/privacy-policy/">Privacy Policy</a> + <!-- <a class="dropdown-item" href="/community/professional-support/">Professional Support</a> update if we even want to keep --> + <a class="dropdown-item" href="/community/who-we-are/">Who We Are</a> + <!-- nikolai needs to add himself --> + </div> + </li> + + <!-- GitHub --> + <li class="nav-item"> + <a class="nav-link" href="http://github.com/apache/mahout";><i class="fa fa-github"></i></a> + </li> + </ul> - </li> - <!-- <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Recommendations<b class="caret"></b></a> - <ul class="dropdown-menu"> - - </ul> --> - </li> - </ul> -</div><!--/.nav-collapse --> + + <!-- <form class="form-inline my-2 my-lg-0"> + <input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search"> + <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> + </form> --> + </div> - </div> + </div> -</div> +</nav> - <div id="sidebar"> - <div id="sidebar-wrap"> - <h2>Twitter</h2> - <ul class="sidemenu"> - <li> -<a class="twitter-timeline" href="https://twitter.com/ApacheMahout"; data-widget-id="422861673444028416">Tweets by @ApacheMahout</a> -<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> -</li> - </ul> - <h2>Apache Software Foundation</h2> - <ul class="sidemenu"> - <li><a href="http://www.apache.org/foundation/how-it-works.html";>How the ASF works</a></li> - <li><a href="http://www.apache.org/foundation/getinvolved.html";>Get Involved</a></li> - <li><a href="http://www.apache.org/dev/";>Developer Resources</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> - </ul> - <h2>Related Projects</h2> - <ul class="sidemenu"> - <li><a href="http://lucene.apache.org/";>Apache Lucene</a></li> - <li><a href="http://hadoop.apache.org/";>Apache Hadoop</a></li> - <li><a href="http://bigtop.apache.org/";>Apache Bigtop</a></li> - <li><a href="http://spark.apache.org/";>Apache Spark</a></li> - <li><a href="http://flink.apache.org/";>Apache Flink</a></li> - </ul> - </div> -</div> - <div id="content-wrap" class="clearfix"> - <div id="main"> + <div class="container mt-5 pb-4"> - <h1 id="github-setup-and-pull-requests-prs">Github Setup and Pull Requests (PRs)</h1> + <div class="row"> + + <div class="col-lg-8"> + <h1 id="github-setup-and-pull-requests-prs">Github Setup and Pull Requests (PRs)</h1> <p>There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at @@ -289,29 +155,33 @@ So if you perform âgit push origin masterâ it will go to github.</p> <p>To attach to the apache git repo do the following:</p> -<pre><code>git remote add apache https://git-wip-us.apache.org/repos/asf/mahout.git +<div class="highlighter-rouge"><pre class="highlight"><code>git remote add apache https://git-wip-us.apache.org/repos/asf/mahout.git </code></pre> +</div> <p>To check your remote setup</p> -<pre><code>git remote -v +<div class="highlighter-rouge"><pre class="highlight"><code>git remote -v </code></pre> +</div> <p>you should see something like this:</p> -<pre><code>origin https://github.com/your-github-id/mahout.git (fetch) +<div class="highlighter-rouge"><pre class="highlight"><code>origin https://github.com/your-github-id/mahout.git (fetch) origin https://github.com/your-github-id/mahout.git (push) apache https://git-wip-us.apache.org/repos/asf/mahout.git (fetch) apache https://git-wip-us.apache.org/repos/asf/mahout.git (push) </code></pre> +</div> <p>Now if you want to experiment with a branch everything, by default, points to your github account because âoriginâ is default. You can work as normal using only github until you are ready to merge with the apache remote. Some conventions will integrate with Apache Jira ticket numbers.</p> -<pre><code>git checkout -b mahout-xxxx #xxxx typically is a Jira ticket number +<div class="highlighter-rouge"><pre class="highlight"><code>git checkout -b mahout-xxxx #xxxx typically is a Jira ticket number #do some work on the branch git commit -a -m "doing some work" git push origin mahout-xxxx # notice pushing to **origin** not **apache** </code></pre> +</div> <p>Once you are ready to commit to the apache remote you can merge and push them directly or better yet create a PR.</p> @@ -319,9 +189,10 @@ git push origin mahout-xxxx # notice pushing to **origin** not **apache** <p>Push your branch to Github:</p> -<pre><code>git checkout mahout-xxxx +<div class="highlighter-rouge"><pre class="highlight"><code>git checkout mahout-xxxx git push origin mahout-xxxx </code></pre> +</div> <p>Go to your mahout-xxxx branch on Github. Since you forked it from Githubâs apache/mahout it will default any PR to go to apache/master.</p> @@ -362,45 +233,50 @@ same time, it is recommended to use <strong>squash commits</strong>.</p> <p>Merging pull requests are equivalent to a âpullâ of a contributorâs branch:</p> -<pre><code>git checkout master # switch to local master branch +<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master # switch to local master branch git pull apache master # fast-forward to current remote HEAD git pull --squash https://github.com/cuser/mahout cbranch # merge to master </code></pre> +</div> <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 +message. Read git help for merge or pull for more information about <code class="highlighter-rouge">--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>If you are ready to merge your own (committerâs) PR you probably only need to merge (not pull), since you have a local copy that youâve been working on. This is the branch that you used to create the PR.</p> -<pre><code>git checkout master # switch to local master branch +<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master # switch to local master branch git pull apache master # fast-forward to current remote HEAD git merge --squash mahout-xxxx </code></pre> +</div> <p>Remember to run regular patch checks, build with tests enabled, and change CHANGELOG.</p> <p>If everything is fine, you now can commit the squashed request along the lines</p> -<pre><code>git commit --author <contributor_email> -a -m "MAHOUT-XXXX description closes apache/mahout#ZZ" +<div class="highlighter-rouge"><pre class="highlight"><code>git commit --author <contributor_email> -a -m "MAHOUT-XXXX description closes apache/mahout#ZZ" </code></pre> +</div> -<p>MAHOUT-XXXX is all caps and where <code>ZZ</code> is the pull request number on apache/mahout repository. Including +<p>MAHOUT-XXXX is all caps and where <code class="highlighter-rouge">ZZ</code> is the pull request number on apache/mahout repository. Including âcloses apache/mahout#ZZâ will close the PR automatically. More information is found here [<a href="https://help.github.com/articles/closing-issues-via-commit-messages";>3</a>].</p> <p>Next, push to git-wip-us.a.o:</p> -<pre><code>push apache master +<div class="highlighter-rouge"><pre class="highlight"><code>push apache master </code></pre> +</div> <p>(this will require Apache handle credentials).</p> <p>The PR, once pushed, will get mirrored to github. To update your github version push there too:</p> -<pre><code>push origin master +<div class="highlighter-rouge"><pre class="highlight"><code>push origin master </code></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 @@ -412,11 +288,12 @@ would warn to begin with. Anyway, watch for dupe PRs (based on same source branc <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> -<pre><code>git commit --allow-empty -m "closes apache/mahout#ZZ *Won't fix*" +<div class="highlighter-rouge"><pre class="highlight"><code>git commit --allow-empty -m "closes apache/mahout#ZZ *Won't fix*" git push apache master </code></pre> +</div> -<p>that should close PR <code>ZZ</code> on github mirror without merging and any code modifications in the master repository.</p> +<p>that should close PR <code class="highlighter-rouge">ZZ</code> on github mirror without merging and any code modifications in the master repository.</p> <h2 id="apachegithub-integration-features">Apache/github integration features</h2> @@ -424,41 +301,66 @@ git push apache master Mahout issue handles must be in the form MAHOUT-YYYYY (all capitals). Usually it makes sense to file a jira issue first, and then create a PR with description</p> -<pre><code>MAHOUT-YYYY: <jira-issue-description> +<div class="highlighter-rouge"><pre class="highlight"><code>MAHOUT-YYYY: <jira-issue-description> </code></pre> +</div> <p>In this case all subsequent comments will automatically be copied to jira without having to mention jira issue explicitly in each comment of the PR.</p> - </div> - </div> -</div> - <footer class="footer" align="center"> - <div class="container"> - <p> - Copyright © 2014-2016 The Apache Software Foundation, Licensed under - the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0</a>. - <br /> - Apache Mahout, Mahout, Apache, the Apache feather logo, and the elephant rider logo are either registered trademarks or trademarks of <a href="http://www.apache.org/foundation/marks/";>The Apache Software Foundation</a> in the United States and other countries. - </p> </div> - </footer> - - <script src="/assets/themes/mahout-retro/js/jquery-1.9.1.min.js"></script> - <script src="/assets/themes/mahout-retro/js/bootstrap.min.js"></script> - <script> - (function() { - var cx = '012254517474945470291:vhsfv7eokdc'; - var gcse = document.createElement('script'); - gcse.type = 'text/javascript'; - gcse.async = true; - gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + - '//www.google.com/cse/cse.js?cx=' + cx; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(gcse, s); - })(); - </script> + + <div class="col-lg-4"> + <!-- Apache Software Foundation Links --> +<div class="card mb-4"> + <div class="card-header"> + Apache Software Foundation + </div> + <div class="card-body"> + <ul class="list-unstyled mb-0"> + <li> + <a href="http://www.apache.org/foundation/how-it-works.html";>Apache Software Foundation</a> + </li> + <li> + <a href="http://www.apache.org/licenses/";>Apache License</a> + </li> + <li> + <a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> + </li> + <li> + <a href="http://www.apache.org/foundation/thanks.html";>Thanks</a> + </li> + </ul> + </div> +</div> + +<!-- Twitter Posts Widget --> +<div class="card"> + <div class="card-body"> + <a class="twitter-timeline" data-height="500" href="https://twitter.com/ApacheMahout";>Tweets by ApacheMahout</a> + <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> + </div> +</div> + </div> + + </div> + +</div> + + + <footer class="footer bg-light"> + <div class="container text-center small"> + Copyright © 2014-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. + </div> +</footer> + + <script src="/assets/vendor/jquery/jquery-slim.min.js"></script> + <script src="/assets/vendor/popper/popper.min.js"></script> + <script src="/assets/vendor/bootstrap/js/bootstrap.min.js"></script> + <script src="/assets/header.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; type="text/javascript"></script> + </body> -</html> +</html>
http://git-wip-us.apache.org/repos/asf/mahout/blob/5112e9ec/developers/githubPRs.html ---------------------------------------------------------------------- diff --git a/developers/githubPRs.html b/developers/githubPRs.html index e083236..2218c55 100644 --- a/developers/githubPRs.html +++ b/developers/githubPRs.html @@ -1,278 +1,144 @@ +<!DOCTYPE html> +<html lang=" en "> + +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <title> + Apache Mahout + + </title> + + <meta name="description" content="Distributed Linear Algebra"> + + <link rel="stylesheet" href="/assets/css/main.css"> + + <!-- Font Awesome --> + <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"; rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"> + + <!-- Google Fonts --> + <link href="https://fonts.googleapis.com/css?family=Maven+Pro:400,500"; rel="stylesheet"> + <link href="https://fonts.googleapis.com/css?family=Muli:400,400i,700,700i"; rel="stylesheet"> + + <link rel="canonical" href="http://mahout.apache.org//developers/githubPRs.html";> + <link rel="alternate" type="application/rss+xml" title="Apache Mahout" href="/%20/feed.xml"> -<!DOCTYPE html> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Apache Mahout: Scalable machine learning and data mining</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="Distribution" content="Global"> - <meta name="Robots" content="index,follow"> - <meta name="keywords" content="apache, apache hadoop, apache lucene, - business data mining, cluster analysis, - collaborative filtering, data extraction, data filtering, data framework, data integration, - data matching, data mining, data mining algorithms, data mining analysis, data mining data, - data mining introduction, data mining software, - data mining techniques, data representation, data set, datamining, - feature extraction, fuzzy k means, genetic algorithm, hadoop, - hierarchical clustering, high dimensional, introduction to data mining, kmeans, - knowledge discovery, learning approach, learning approaches, learning methods, - learning techniques, lucene, machine learning, machine translation, mahout apache, - mahout taste, map reduce hadoop, mining data, mining methods, naive bayes, - natural language processing, - supervised, text mining, time series data, unsupervised, web data mining"> - <link rel="shortcut icon" type="image/x-icon" href="https://mahout.apache.org/images/favicon.ico";> - <!--<script type="text/javascript" src="/js/prototype.js"></script>--> - <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/prototype/1.7.2.0/prototype.js";></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/effects.js"></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/search.js"></script> - <script type="text/javascript" src="/assets/themes/mahout-retro/js/slides.js"></script> - - <link href="/assets/themes/mahout-retro/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="/assets/themes/mahout-retro/css/bootstrap-responsive.css" rel="stylesheet"> - <link rel="stylesheet" href="/assets/themes/mahout-retro/css/global.css" type="text/css"> - - <!-- mathJax stuff -- use `\(...\)` for inline style math in markdown --> - <script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - tex2jax: { - skipTags: ['script', 'noscript', 'style', 'textarea', 'pre'] - } - }); - MathJax.Hub.Queue(function() { - var all = MathJax.Hub.getAllJax(), i; - for(i = 0; i < all.length; i += 1) { - all[i].SourceElement().parentNode.className += ' has-jax'; - } - }); - </script> - <script type="text/javascript"> - var mathjax = document.createElement('script'); - mathjax.type = 'text/javascript'; - mathjax.async = true; - - mathjax.src = ('https:' == document.location.protocol) ? - 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' : - 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'; - - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(mathjax, s); - </script> </head> -<body id="home" data-twttr-rendered="true"> - <div id="wrap"> - <div id="header"> - <div id="logo"><a href="/"><img src="/assets/img/mahout-logo-brudman.png" alt="Logos for Mahout and Apache Software Foundation" /></a></div> - <div id="search"> - <form id="search-form" action="http://www.google.com/search"; method="get" class="navbar-search pull-right"> - <input value="http://mahout.apache.org"; name="sitesearch" type="hidden"> - <input class="search-query" name="q" id="query" type="text"> - <input id="submission" type="image" src="/assets/img/mahout-lupe.png" alt="Search" /> - </form> - </div> - - <div class="navbar navbar-inverse" style="position:absolute;top:133px;padding-right:0px;padding-left:0px;"> - <div class="navbar-inner" style="border: none; background: #999; border: none; border-radius: 0px;"> - <div class="container"> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <!-- <a class="brand" href="#">Apache Community Development Project</a> --> - <!--<div class="nav-collapse collapse">--> -<div class="collapse navbar-collapse" id="main-navbar"> - <ul class="nav navbar-nav"> - <!-- <li><a href="/">Home</a></li> --> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">General<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/general/downloads.html">Downloads</a> - <li><a href="/general/who-we-are.html">Who we are</a> - <li><a href="/general/mailing-lists,-irc-and-archives.html">Mailing Lists</a> - <li><a href="/general/release-notes.html">Release Notes</a> - <li><a href="/general/books-tutorials-and-talks.html">Books, Tutorials, Talks</a></li> - <li><a href="/general/powered-by-mahout.html">Powered By Mahout</a> - <li><a href="/general/professional-support.html">Professional Support</a> - <li class="divider"></li> - <li class="nav-header">Resources</li> - <li><a href="/general/reference-reading.html">Reference Reading</a> - <li><a href="/general/faq.html">FAQ</a> - <li class="divider"></li> - <li class="nav-header">Legal</li> - <li><a href="http://www.apache.org/licenses/";>License</a></li> - <li><a href="http://www.apache.org/security/";>Security</a></li> - <li><a href="/general/privacy-policy.html">Privacy Policy</a> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/developers/developer-resources.html">Developer resources</a></li> - <li><a href="/developers/version-control.html">Version control</a></li> - <li><a href="/developers/buildingmahout.html">Build from source</a></li> - <li><a href="/developers/issue-tracker.html">Issue tracker</a></li> - <li><a href="https://builds.apache.org/job/Mahout-Quality/"; target="_blank">Code quality reports</a></li> - <li class="divider"></li> - <li class="nav-header">Contributions</li> - <li><a href="/developers/how-to-contribute.html">How to contribute</a></li> - <li><a href="/developers/how-to-become-a-committer.html">How to become a committer</a></li> - <li><a href="/developers/gsoc.html">GSoC</a></li> - <li class="divider"></li> - <li class="nav-header">For committers</li> - <li><a href="/developers/how-to-update-the-website.html">How to update the website</a></li> - <li><a href="/developers/patch-check-list.html">Patch check list</a></li> - <li><a href="/developers/github.html">Handling Github PRs</a></li> - <li><a href="/developers/how-to-release.html">How to release</a></li> - <li><a href="/developers/thirdparty-dependencies.html">Third party dependencies</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mahout-Samsara<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/sparkbindings/home.html">Scala & Spark Bindings Overview</a></li> - <li><a href="/users/sparkbindings/faq.html">FAQ</a></li> - <li><a href="/users/flinkbindings/playing-with-samsara-flink.html">Flink Bindings Overview</a></li> - <li class="nav-header">Engines</li> - <li><a href="/users/sparkbindings/home.html">Spark</a></li> - <li><a href="/users/environment/h2o-internals.html">H2O</a></li> - <li><a href="/users/flinkbindings/flink-internals.html">Flink</a></li> - <li class="nav-header">References</li> - <li><a href="/users/environment/in-core-reference.html">In-Core Algebraic DSL Reference</a></li> - <li><a href="/users/environment/out-of-core-reference.html">Distributed Algebraic DSL Reference</a></li> - <li class="nav-header">Tutorials</li> - <li><a href="/users/sparkbindings/play-with-shell.html">Playing with Mahout's Spark Shell</a></li> - <li><a href="/users/environment/how-to-build-an-app.html">How to build an app</a></li> - <li><a href="/users/environment/classify-a-doc-from-the-shell.html">Building a text classifier in Mahout's Spark Shell</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Algorithms<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/basics/algorithms.html">List of algorithms</a> - <li class="nav-header">Distributed Matrix Decomposition</li> - <li><a href="/users/algorithms/d-qr.html">Cholesky QR</a></li> - <li><a href="/users/algorithms/d-ssvd.html">SSVD</a></li> - <li><a href="/users/algorithms/d-als.html">Distributed ALS</a></li> - <li><a href="/users/algorithms/d-spca.html">SPCA</a></li> - <li class="nav-header">Recommendations</li> - <li><a href="/users/algorithms/recommender-overview.html">Recommender Overview</a></li> - <li><a href="/users/algorithms/intro-cooccurrence-spark.html">Intro to cooccurrence-based<br/> recommendations with Spark</a></li> - <li class="nav-header">Classification</li> - <li><a href="/users/algorithms/spark-naive-bayes.html">Spark Naive Bayes</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">MapReduce Basics<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/users/basics/algorithms.html">List of algorithms</a> - <li><a href="/users/basics/quickstart.html">Overview</a> - <li class="divider"></li> - <li class="nav-header">Working with text</li> - <li><a href="/users/basics/creating-vectors-from-text.html">Creating vectors from text</a> - <li><a href="/users/basics/collocations.html">Collocations</a> - <li class="divider"></li> - <li class="nav-header">Dimensionality reduction</li> - <li><a href="/users/dim-reduction/dimensional-reduction.html">Singular Value Decomposition</a></li> - <li><a href="/users/dim-reduction/ssvd.html">Stochastic SVD</a></li> - <li class="divider"></li> - <li class="nav-header">Topic Models</li> - <li><a href="/users/clustering/latent-dirichlet-allocation.html">Latent Dirichlet Allocation</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mahout MapReduce<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="nav-header">Classification</li> - <li><a href="/users/classification/bayesian.html">Naive Bayes</a></li> - <li><a href="/users/classification/hidden-markov-models.html">Hidden Markov Models</a></li> - <li><a href="/users/classification/logistic-regression.html">Logistic Regression (Single Machine)</a></li> - <li><a href="/users/classification/partial-implementation.html">Random Forest</a></li> - <li class="nav-header">Classification Examples</li> - <li><a href="/users/classification/breiman-example.html">Breiman example</a></li> - <li><a href="/users/classification/twenty-newsgroups.html">20 newsgroups example</a></li> - <li><a href="/users/classification/bankmarketing-example.html">SGD classifier bank marketing</a></li> - <li><a href="/users/classification/wikipedia-classifier-example.html">Wikipedia XML parser and classifier</a></li> - <li class="nav-header">Clustering</li> - <li><a href="/users/clustering/k-means-clustering.html">k-Means</a></li> - <li><a href="/users/clustering/canopy-clustering.html">Canopy</a></li> - <li><a href="/users/clustering/fuzzy-k-means.html">Fuzzy k-Means</a></li> - <li><a href="/users/clustering/streaming-k-means.html">Streaming KMeans</a></li> - <li><a href="/users/clustering/spectral-clustering.html">Spectral Clustering</a></li> - <li class="nav-header">Clustering Commandline usage</li> - <li><a href="/users/clustering/k-means-commandline.html">Options for k-Means</a></li> - <li><a href="/users/clustering/canopy-commandline.html">Options for Canopy</a></li> - <li><a href="/users/clustering/fuzzy-k-means-commandline.html">Options for Fuzzy k-Means</a></li> - <li class="nav-header">Clustering Examples</li> - <li><a href="/users/clustering/clustering-of-synthetic-control-data.html">Synthetic data</a></li> - <li class="nav-header">Cluster Post processing</li> - <li><a href="/users/clustering/cluster-dumper.html">Cluster Dumper tool</a></li> - <li><a href="/users/clustering/visualizing-sample-clusters.html">Cluster visualisation</a></li> - <li class="nav-header">Recommendations</li> - <li><a href="/users/recommender/recommender-first-timer-faq.html">First Timer FAQ</a></li> - <li><a href="/users/recommender/userbased-5-minutes.html">A user-based recommender <br/>in 5 minutes</a></li> - <li><a href="/users/recommender/matrix-factorization.html">Matrix factorization-based<br/> recommenders</a></li> - <li><a href="/users/recommender/recommender-documentation.html">Overview</a></li> - <li><a href="/users/recommender/intro-itembased-hadoop.html">Intro to item-based recommendations<br/> with Hadoop</a></li> - <li><a href="/users/recommender/intro-als-hadoop.html">Intro to ALS recommendations<br/> with Hadoop</a></li> + +<body> + + <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout"> + + <div class="container"> + + <a class="navbar-brand" href="/"> + <img src="/assets/mahout-logo-blue.svg" alt=""> + </a> + + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + + <div class="collapse navbar-collapse" id="navbarSupportedContent"> + + <ul class="navbar-nav ml-auto"> + + <!-- Download --> + <li class="nav-item"> + <a class="nav-link" href="/downloads/">Download</a> + </li> + + <li class="nav-item"> + <a class="nav-link" href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a> + </li> + + <!-- Developers --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Developers</a> + <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> + <a class="dropdown-item" href="/developers/developer-resources.html">Developer Resources</a> + <a class="dropdown-item" href="/developers/buildingmahout/">Building Mahout from Source</a> + <a class="dropdown-item" href="/developers/issue-tracker/">Issues Tracking (JIRA)</a> + <!-- <a class="dropdown-item" href="/developers/patch-check-list/">Patch Check List</a> going to github template --> + <!-- <a class="dropdown-item" href="/developers/reference/">References</a> a lot of overlap with books, talks, etc. page --> + <a class="dropdown-item" href="/developers/release-notes/">Release Notes</a> + <!-- <a class="dropdown-item" href="/developers/thirdparty-dependencies/">Third Party Dependencies</a> is our site the reasonable place for this? --> + <!-- <a class="dropdown-item" href="/developers/version-control/">Version Control</a> --> + <div class="dropdown-divider"></div> + <h6 class="dropdown-header">How To's</h6> + <a class="dropdown-item" href="/developers/how-to-contribute/">How to Contribute</a> + <a class="dropdown-item" href="/developers/githubPRs/">Github PRs</a> + <a class="dropdown-item" href="/developers/how-to-become-a-committer/">How to Become a Committer</a> + <a class="dropdown-item" href="/developers/how-to-release/">How to Release</a> + <a class="dropdown-item" href="/developers/how-to-update-the-website/">How to Update the Website</a> + </div> + </li> + + <!-- Docs --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Docs</a> + <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> + <h6 class="dropdown-header">Release</h6> + <a class="dropdown-item" href="/docs/0.13.0">0.13.0</a> + <div class="dropdown-divider"></div> + <h6 class="dropdown-header">Latest Snapshot (Development)</h6> + <a class="dropdown-item" href="/docs/latest">0.13.1-SNAPSHOT</a> + </div> + </li> + + <!-- Community --> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Community</a> + <div class="dropdown-menu dropdown-menu-right"> + <a class="dropdown-item" href="/community/history/">History of the Apache Mahout Project</a> + <a class="dropdown-item" href="/community/blogs/">Blog Posts About Mahout</a> + <a class="dropdown-item" href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a> + <!-- <a class="dropdown-item" href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> --> + <a class="dropdown-item" href="/community/buildingmahout/">Building Mahout</a> + <!-- <a class="dropdown-item" href="/community/faq/">FAQ</a> needs a lot of updating --> + <a class="dropdown-item" href="/community/gsoc/">GSoC</a> + <!-- Is OK- updated Map/Reduce verbage to reflect Samsara --> + <!-- <a class="dropdown-item" href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep them? --> + <!-- <a class="dropdown-item" href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links cleanedup - do we still want this even?--> + <a class="dropdown-item" href="/community/mailing-lists/">Mailing Lists</a> + <!-- Clean and pretty --> + <!-- <a class="dropdown-item" href="/community/powered-by-mahout/">Powered By Mahout</a> needs update --> + <a class="dropdown-item" href="/community/privacy-policy/">Privacy Policy</a> + <!-- <a class="dropdown-item" href="/community/professional-support/">Professional Support</a> update if we even want to keep --> + <a class="dropdown-item" href="/community/who-we-are/">Who We Are</a> + <!-- nikolai needs to add himself --> + </div> + </li> + + <!-- GitHub --> + <li class="nav-item"> + <a class="nav-link" href="http://github.com/apache/mahout";><i class="fa fa-github"></i></a> + </li> + </ul> - </li> - <!-- <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Recommendations<b class="caret"></b></a> - <ul class="dropdown-menu"> - - </ul> --> - </li> - </ul> -</div><!--/.nav-collapse --> + + <!-- <form class="form-inline my-2 my-lg-0"> + <input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search"> + <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> + </form> --> + </div> - </div> + </div> -</div> +</nav> - <div id="sidebar"> - <div id="sidebar-wrap"> - <h2>Twitter</h2> - <ul class="sidemenu"> - <li> -<a class="twitter-timeline" href="https://twitter.com/ApacheMahout"; data-widget-id="422861673444028416">Tweets by @ApacheMahout</a> -<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> -</li> - </ul> - <h2>Apache Software Foundation</h2> - <ul class="sidemenu"> - <li><a href="http://www.apache.org/foundation/how-it-works.html";>How the ASF works</a></li> - <li><a href="http://www.apache.org/foundation/getinvolved.html";>Get Involved</a></li> - <li><a href="http://www.apache.org/dev/";>Developer Resources</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> - <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> - </ul> - <h2>Related Projects</h2> - <ul class="sidemenu"> - <li><a href="http://lucene.apache.org/";>Apache Lucene</a></li> - <li><a href="http://hadoop.apache.org/";>Apache Hadoop</a></li> - <li><a href="http://bigtop.apache.org/";>Apache Bigtop</a></li> - <li><a href="http://spark.apache.org/";>Apache Spark</a></li> - <li><a href="http://flink.apache.org/";>Apache Flink</a></li> - </ul> - </div> -</div> - <div id="content-wrap" class="clearfix"> - <div id="main"> + <div class="container mt-5 pb-4"> + + <div class="row"> - <h1 id="handling-github-prs">Handling Github PRs</h1> + <div class="col-lg-8"> + <h1 id="handling-github-prs">Handling Github PRs</h1> <hr /> @@ -291,17 +157,19 @@ same time, it is recommended to use <strong>squash commits</strong>.</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> -<pre><code>git checkout master # switch to local master branch +<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master # switch to local master branch git pull apache master # fast-forward to current remote HEAD git pull --squash https://github.com/cuser/mahout cbranch # merge to master </code></pre> +</div> <p>In this example we assume that contributor Github handle is âcuserâ and the PR branch name is âcbranchâ there. We also assume that <em>apache</em> remote is configured as</p> -<pre><code>apache https://git-wip-us.apache.org/repos/asf/mahout.git (fetch) +<div class="highlighter-rouge"><pre class="highlight"><code>apache https://git-wip-us.apache.org/repos/asf/mahout.git (fetch) apache https://git-wip-us.apache.org/repos/asf/mahout.git (push) </code></pre> +</div> <p>Squash pull ensures all PR history is squashed into single commit. Also, it is not yet committed, even if fast forward is possible, so you get chance to change things before committing.</p> @@ -312,8 +180,9 @@ fast forward is possible, so you get chance to change things before committing.< <p>Suppose everything is fine, you now can commit the squashed request</p> -<pre><code>git commit -a +<div class="highlighter-rouge"><pre class="highlight"><code>git commit -a </code></pre> +</div> <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 [<a href="https://help.github.com/articles/closing-issues-via-commit-messages";>3</a>].</p> @@ -332,9 +201,10 @@ would warn to begin with. Anyway, watch for dupe PRs (based on same source branc <p>When we want to reject a PR (close without committing), just do the following commit on masterâs HEAD <em>without merging the PR</em>:</p> -<pre><code>git commit --allow-empty -m "closes #ZZ *Won't fix*" +<div class="highlighter-rouge"><pre class="highlight"><code>git commit --allow-empty -m "closes #ZZ *Won't fix*" git push apache master </code></pre> +</div> <p>that should close PR without merging and any code modifications in the master repository.</p> @@ -343,34 +213,58 @@ git push apache master <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> - <footer class="footer" align="center"> - <div class="container"> - <p> - Copyright © 2014-2016 The Apache Software Foundation, Licensed under - the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0</a>. - <br /> - Apache Mahout, Mahout, Apache, the Apache feather logo, and the elephant rider logo are either registered trademarks or trademarks of <a href="http://www.apache.org/foundation/marks/";>The Apache Software Foundation</a> in the United States and other countries. - </p> </div> - </footer> - - <script src="/assets/themes/mahout-retro/js/jquery-1.9.1.min.js"></script> - <script src="/assets/themes/mahout-retro/js/bootstrap.min.js"></script> - <script> - (function() { - var cx = '012254517474945470291:vhsfv7eokdc'; - var gcse = document.createElement('script'); - gcse.type = 'text/javascript'; - gcse.async = true; - gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + - '//www.google.com/cse/cse.js?cx=' + cx; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(gcse, s); - })(); - </script> + + <div class="col-lg-4"> + <!-- Apache Software Foundation Links --> +<div class="card mb-4"> + <div class="card-header"> + Apache Software Foundation + </div> + <div class="card-body"> + <ul class="list-unstyled mb-0"> + <li> + <a href="http://www.apache.org/foundation/how-it-works.html";>Apache Software Foundation</a> + </li> + <li> + <a href="http://www.apache.org/licenses/";>Apache License</a> + </li> + <li> + <a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> + </li> + <li> + <a href="http://www.apache.org/foundation/thanks.html";>Thanks</a> + </li> + </ul> + </div> +</div> + +<!-- Twitter Posts Widget --> +<div class="card"> + <div class="card-body"> + <a class="twitter-timeline" data-height="500" href="https://twitter.com/ApacheMahout";>Tweets by ApacheMahout</a> + <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> + </div> +</div> + </div> + + </div> + +</div> + + + <footer class="footer bg-light"> + <div class="container text-center small"> + Copyright © 2014-2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. + </div> +</footer> + + <script src="/assets/vendor/jquery/jquery-slim.min.js"></script> + <script src="/assets/vendor/popper/popper.min.js"></script> + <script src="/assets/vendor/bootstrap/js/bootstrap.min.js"></script> + <script src="/assets/header.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; type="text/javascript"></script> + </body> -</html> +</html>
