Git Workflow
- Derk Snijders
Owned by Derk Snijders
Git is the version control software that we use in the OMS project in order to log what has been done, store backups and collaborate together on the project.
We use a specific Git workflow for the OMS project, namely the Git branching model that can be found here. (diagram below)
Additionally, we maintain the following set of rules:
- Every micro service has its own repository
- These should be under the AEGEE organization
- The creator of a pull request is not the one who merges it.
- This is done in order to have a second set of eyes go over the code and spot possible errors.
- If you are working on fixing a specific JIRA issue, use the issue code (ie. 'CORE-33' as the branch!).
- Naming things like branches, commits and even pull request in this manner automatically links them to JIRA!
- The creator of a branch also deletes the branch.
If you have any questions about the usage of Git do not be afraid to ask!
Below is a diagram from the site summarizing the model.
