[
https://issues.apache.org/jira/browse/QUARKS-15?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15187799#comment-15187799
]
Susan L. Cline commented on QUARKS-15:
--------------------------------------
Steps I took on a MacOS X laptop to setup my environment for committing and
pulling files:
For my initial clone and configuration stuff:
git clone https://[email protected]/repos/asf/incubator-quarks.git
git config user.name "Susan L. Cline"
git config user.email [email protected]
MacOSX specific stuff:
git config --global credential.helper osxkeychain
git config --global core.autocrlf input
Add upstream ... this might not be needed:
git remote add upstream
https://[email protected]/repos/asf/incubator-quarks.git
git checkout master
git fetch upstream
git rebase upstream/master
git push
git checkout -b "console_hover_text" -- whatever the name of your branch is ...
git add
console/servlets/src/main/java/quarks/console/servlets/ConsoleJobServlet.java
-- add your file(s)
git commit -m 'QUARKS-6 updated objectname for jobmxbean'
git checkout master
git fetch upstream
git rebase upstream/master
git push
git checkout console_hover_text -- whatever your branch name is
git rebase master
git diff -- I just do this to make sure there are no conflicts
git push --set-upstream origin console_hover_text -- whatever your branch name
is
...
Now look for the commit notice, hang out on the dev list to see if anyone has
objections or wants to discuss the commit
If not, make the pull
git checkout master
git pull --rebase
git checkout console_hover_text -- your branch name
git rebase master
git checkout master
git log -- this is the part I am not sure about, Luciano mentioned to check
this .. I don't really understand this. I don't see an entry here for this
commit. Is that good?
git merge console_hover_text -- your branch
git push
.. you should be done. Now, to delete the branch you just merged:
git checkout master
git branch --delete console_hover_text -- your branch
git push origin --delete console_hover_text -- your branch
> 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)
