[
https://issues.apache.org/jira/browse/MAHOUT-1587?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14046086#comment-14046086
]
ASF GitHub Bot commented on MAHOUT-1587:
----------------------------------------
Github user pferrel commented on the pull request:
https://github.com/apache/mahout/pull/24#issuecomment-47365291
As to rebasing:
Instead of doing what you and I did, merging the master every so often with
the branch, you can rebase to the new master each time instead. This mainly
affects commit history and might be the way to go, given that squash doesn't do
exactly what we thought in all cases.
There is a good writeup on this
[here](http://mettadore.com/analysis/the-ever-deployable-github-workflow/) that
describes a version of what github do themselves. The basic idea is (true of
Mahout also) that the master is always deployable and the branch history should
not be interwoven into the master when merging a branch.
You are right to be careful about pushing changes to apache. The policy
makes rewriting that history very difficult if not impossible. A little clutter
is probably OK but if rebasing causes the right history to get written it will
be better in the long run.
> Update website to reflect move to GitHub
> -----------------------------------------
>
> Key: MAHOUT-1587
> URL: https://issues.apache.org/jira/browse/MAHOUT-1587
> Project: Mahout
> Issue Type: Bug
> Components: Documentation
> Affects Versions: 1.0
> Reporter: Andrew Palumbo
> Fix For: 1.0
>
>
> The following pages have directions for either checking out code from SVN,
> patching with SVN or have direct links to files in the old SVN repo:
> -mahout.apache.org/developers/developer-resources.html-
> -mahout.apache.org/developers/version-control.html-
> http://mahout.apache.org/developers/patch-check-list.html
> http://mahout.apache.org/developers/how-to-contribute.html
> -mahout.apache.org/users/basics/creating-vectors-from-text.html-
> -mahout.apache.org/users/classification/bayesian.html-
> -mahout.apache.org/users/classification/twenty-newsgroups.html-
> -mahout.apache.org/users/clustering/k-means-clustering.html-
> -mahout.apache.org/users/clustering/fuzzy-k-means.html-
> -mahout.apache.org/users/clustering/canopy-clustering.html-
--
This message was sent by Atlassian JIRA
(v6.2#6252)
