[
https://issues.apache.org/jira/browse/QUARKS-15?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15202303#comment-15202303
]
Susan L. Cline commented on QUARKS-15:
--------------------------------------
Since there have been many comments to this JIRA, I summarized what my
experience was as a committer now that we use the mirror on git-hub.
GITHUB STUFF:
1) Fork the apache repository that is mirrored on github here:
https://github.com/apache/incubator-quarks
2) clone your forked repository from github (in my case):
git clone https://github.com/home4slc/incubator-quarks.git
3) Add your files and commit them
cd to the incubator-quarks directory where you cloned your github repository
i.e, ~/github/incubator-quarks
git checkout master
git fetch upstream
git rebase upstream/master
git push
git checkout -b QUARKS-XX_your_branch_name
git add <myfile>
git add <anotherfile>
git commit -m "QUARKS-XXX your text"
git checkout master
git fetch upstream
git rebase upstream/master
git push
git checkout QUARKS-XX_your_branch_name
git rebase master
git push --set-upstream origin QUARKS-XX_your_branch_name
4) Make your pull request
Now your files have been pushed to your fork at the github repository.
Point your browser to your fork. Mine is here:
https://github.com/home4slc/incubator-quarks
The screen shot called 'github_user_fork' shows that I pushed the branch
'QUARKS-20_tuple_count_view' to my fork.
Once you click the 'Compare & pull request' button, you'll see something like
the screen shot called
'make_pull_request'.
Include in the title of the pull request the JIRA issue, i.e, QUARKS-XX in the
title.
Check that the base fork is apache/incubator-quarks, base is master
the head fork is <your_user_name>/incubator-quarks, compare is the name of your
branch.
Check that the branches can be merged. If so click the 'Pull Request' button.
******************************************
APACHE STUFF:
5) in a different directory from where your github clone is, clone the apache
repository:
git clone https://git-wip-us.apache.org/repos/asf/incubator-quarks.git <--
one time setup
cd incubator-quarks
6) Set the remote repository to the mirror at github
git remote add mirror https://github.com/apache/incubator-quarks.git
7) Merge the pull request
git fetch mirror pull/28/head:pr-28 <-- 28 is the number of the pull request.
git merge pr-28 -m "my merge message"
git push origin master
After you do the push, if you go back to the github ui, you'll see an image
like 'after_merging_pull_request" where it will
show you your merge is successful.
After that, you can delete the branch
git branch -d pr-28 <-- delete the branch
The next time you make a pull request, you don't need to clone the repository,
nor add the remote mirror.
But you should do the following:
git checkout master
git pull
> Document commit process
> -----------------------
>
> Key: QUARKS-15
> URL: https://issues.apache.org/jira/browse/QUARKS-15
> Project: Quarks
> Issue Type: Improvement
> Components: Documentation
> Reporter: Susan L. Cline
> Assignee: Susan L. Cline
> Priority: Minor
> Labels: commit, documentation,
> Attachments: committing_files.txt
>
>
> Attached is a text file of an example I went through to commit and pull files
> as a committer on quarks.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
