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.
- Update your local scheduledb branch with the latest remote branch changes.
git checkout -f scheduledb
git pull - Create and checkout a new local branch for your work.
git checkout -b yourLocalBranchName - Create your code changes (e.g. Geb and Spock tests) into the new local branch.
- Commit your changes into your local branch
git commit -m "describe your code changes" - Get the latest remote branch changes into your local scheduledb branch
git checkout scheduledb
git pull - Merge scheduledb to your local branch.
git checkout yourLocalBranchName
git merge scheduledb - Resolve any merge conflicts.
- Push yourLocalBranchName to the remote repository so that the team can evaluate your changes.
git push origin yourLocalBranchName - Team does a Code Review of your changes
git checkout scheduledb
git diff yourLocalBranchName - Once the request is approved by the team, merge yourLocalBranchName into scheduledb.
git merge -m "Merging yourLocalBranchName into scheduledb" yourLocalBranchName - Push the local scheduledb code changes to the remote branch
git push