The branch where development work takes place is the master.
If you are developing a feature, or you are working on a bug that involves an interface change, you'll need to go through the design phase.
Update your (forked & locally cloned) repository's master branch with the golden repository's master (IMPORTANT: Your fork's master branch should not be touched with any of your development changes. It should just reflect the golden repository's master, exactly).
git checkout master git pull upstream master |
Create a development branch for the ticket that you would like to work on and name it with the JIRA ID of the ticket:
Develop Your Code and Your TestsWe recommend developing your code and your tests in parallel. Your PTL tests should provide good coverage of the requirements and your design. Put License Text in Headers for Code and TestsIf you create new source or test files, make sure that this license text is in the header for all code and test files. Get Approval for Your Code and TestsYour code is ready to be merged into the golden repository when the following are true:
Tip: Commit often, perfect later.
|
Your code is ready to be merged into the golden repository when the following are true:
Housekeeping: we strongly recommend that you delete the development branch from your forked and cloned repos now.
git checkout master git push origin --delete <JIRA ID> (deletes <JIRA ID> from the fork) git branch -D <JIRA ID> (deletes <JIRA ID> from local clone) |