Page History

...

1. Create a branch to work on:

   Code Block
   git fetch git checkout -b xyz remotes/origin/trunk

2. Implement Download the feature.patch

3. Rebase:Apply

   Code Block
   git rebase remotes/origin/trunkapply KAFKA-XXXX.patch

4. Post the change to JIRA and get it reviewed.Make sure unit tests and system tests pass
5. Push the change back to Apache. Pick one of the following:

   • You should almost always collapse your work into a single check-in in order to avoid cluttering the upstream change-log:

     Code Block
     # assuming trunk is up-to-date with origin git checkout trunk git merge --squash xyz git commit -am "KAFKA-XXX xyz feature; reviewed by <reviewers>" --author="firstname lastname <contributoremail>" git push origin trunk

   • If you are absolutely sure you want to preserve your local intermediate check-in history then push directly from your feature branch instead of the above merge (or use merge without the squash option):

     Code Block
     # from feature branch xyz git push origin trunk

...