Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

We currently perform QA on pull requests, although the process is still being polished. We also have not completed the JIRA workflow when the developer submits a pull request, which means that the JIRA does not transition to Patch Available when a pull request is submitted. We are currently discussing on the list how to adapt our workflow.

Example workflow

there are many ways to setup your git environment but this one example:

fork the apache github repo

go to https://github.com/apache/zookeeper and click the fork button to create your own fork.

make a local clone of your fork

on your local machine run

Code Block
languagebash
$ git clone https://github.com/<userid>/zookeeper.git my-zookeeper
add the apache github repo
Code Block
languagebash
$ git remote add apache-github https://github.com/apache/zookeeper.git
make sure you are uptodate
Code Block
languagebash
$ git pull apache-github 
create a branch named after the issue you are working on
Code Block
languagebash
$ git checkout remotes/apache-github/master
$ git checkout -B ZOOKEEPER-<jiraNumber>

<jiraNumber> is the JIRA you will be working on.

make your changes

sorry can't help you here. it's all up to you to fix the bug (smile)

commit everything

do you will want to do some combination of git add and git commit to get all your changes committed. when you run git commit, you only need a single line in the commit message it should have the form ZOOKEEPER-jiraNumber: jiraTitle.

push your change to git hub
Code Block
$ git push origin ZOOKEEPER-<jiraNumber>

 

generate a pull request

got to the github page that lists your branches. you will see a pull request button that you can press.

Committing Guidelines for committers

...