[
https://issues.apache.org/jira/browse/MAHOUT-1587?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14045466#comment-14045466
]
ASF GitHub Bot commented on MAHOUT-1587:
----------------------------------------
Github user pferrel commented on the pull request:
https://github.com/apache/mahout/pull/24#issuecomment-47303150
This sounds like what happened to me.
It looks like you are using two local with one remote repo each, correct?
The instructions Dmitriy and I wrote describe one local and with two remotes.
You have to merge your branch into the master with:
git pull origin mahout-xxxx # pulls from your github branch
git checkout master # move to the master branch
git pull apache master # just to make sure you have the latest
git merge --squash mahout-xxxx # merge your branch with the master AND
squash
git push apache master # push the now merged master to apache's git
The last push goes to apache's git repo, otherwise it will not get mirrored
to github. Your's was not pushed according to the history on github, which
mirrors what was pushed to the apache git repo.
Ping me on gtalk: [email protected] if I'm online I'll try to help
> 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)
