You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@hivemall.apache.org by Makoto Yui <my...@apache.org> on 2016/12/05 11:23:39 UTC

Instruction for squash and merging pull requests

Fixed the contributor of a pull request [1].
[1] https://github.com/apache/incubator-hivemall/commit/060bfa990e46252b3db18b5c11058f106ebcbb95

The following is the instruction to squash and merge pull requests:

git checkout master
git checkout -b bug123
git pull http://repourl.git branch
git log | grep "Author" | head -1 # get the author
git checkout master
git merge --squash bug123
git commit -a --author="Author <fo...@me.com>" --message="Close #1:
fixed a bug in xxx"
git push origin master

It's better to keep original contributors.

Thanks,
Makoto