Page History

...

1. JIRA issue set to "in progress"
2. Completion criteria are met
3. Unit tests have been written
4. Local build succeeds
5. Changeset pushed to personal repositoryLocal build succeeds
6. Code review iterations completed
7. Personal Reviewed changesets from personal repository merged to main repository
8. CI passed
9. JIRA issue set to "resolved"
10. QA completed
11. JIRA issue set to "closed"

...

A personal repository is a clone of the code base that is under one user's control. Development is done on a personal repository. This means that when working on a JIRA issue, all changes are committed and pushed to the clone of the main repository and not the main repository itself. Code reviews are created from the personal repository.

Merges must happen in one's personal repository. Merges must be done before a code review is created so that the code review does not contain stale code. Another merge must also be done before pushing to the main repository. Merges should never occur in the main repository. As a best practice, a pull to the personal repository should be done after every code commit from other team members.