[
https://issues.apache.org/jira/browse/QUARKS-15?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15204482#comment-15204482
]
Dale LaBossiere commented on QUARKS-15:
---------------------------------------
The `merge-pr` script at the aforementioned box url automates the APACHE STUFF
step-7 cmds. It also generates a merge comment that looks more like one
generated by a merge via github - it includes a link to the pull-request.
It may be worth clarifying that only steps 5-7 of APACHE STUFF are committer
specific.
The normal github usage flows up to and including creating a pull request work
for everyone.
Nit: there are more git cmds in GITHUB STUFF than are generally necessary in
practice. i.e., if you start with an up to date local master (the first 4 git
cmds in step 3), then 2nd rebase-local-master cmd sequence and the additional
rebase-local-branch cmds aren't needed. Github will let you know if there are
conflicts in your branch/pull request, at which time you can do those
additional rebases.
fwiw, the `rebase-master` script at that same box url automates those first 4
cmds.
> 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: after_merging_pull_request.jpg, committing_files.txt,
> github_user_fork.jpg, make_pull_request.jpg
>
>
> 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)
