The following are developer housekeeping responsibilities.   Any code contributions, like creating local QA tests on your local branch, will require a code review before being merged into the scheduledb branch.

  1. Update your local scheduledb branch with the latest remote branch changes.
    git checkout -f scheduledb
    git pull
  2. Create and checkout a new local branch for your work.
    git checkout -b yourLocalBranchName
  3. Create your code changes (e.g. Geb and Spock tests) into the new local branch.
  4. Commit your changes into your local branch
    git commit -m "describe your code changes"
  5. Get the latest remote branch changes into your local scheduledb branch
    git checkout scheduledb
    git pull
  6. Merge scheduledb to your local branch.
    git checkout yourLocalBranchName
    git merge scheduledb
  7. Resolve any merge conflicts.
  8. Push yourLocalBranchName to the remote repository so that the team can evaluate your changes.
    git push origin yourLocalBranchName
  9. Team does a Code Review of your changes
    git checkout scheduledb
    git diff yourLocalBranchName
  10. Once the request is approved by the team, merge yourLocalBranchName into scheduledb.
    git merge -m "Merging yourLocalBranchName into scheduledb" yourLocalBranchName
  11. Push the local scheduledb code changes to the remote branch
    git push
  • No labels