This section explains the best practices and strategy for branching and merging of sources.
Git Flow Model
Git Flow Source
This is the model we are currently using for branching
This blog post has good definition of Feature, Develop, Release, Hotfix , and Master branches .
Git Flow Links:
- https://nvie.com/posts/a-successful-git-branching-model/
- https://github.com/nvie/gitflow
- https://jeffkreeftmeijer.com/git-flow/
- https://danielkummer.github.io/git-flow-cheatsheet/
- https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
Tutorial using command line git as examples Gitflow Workflow | Atlassian Git Tutorial - https://docs.microsoft.com/en-us/vsts/git/index
Continuous Integration and Deployment (CI/CD)
For API development, the develop branch has Continuous Integration and Deployment (CI/CD) configured into the development and test environments.
A pull request is required to move code from a feature branch into the develop branch. A pull request must have 2 reviewers (one of which can be the original developer, one must be from the Develop Approve group).
Here are some addition links for more information:
Code Review and Pull Requests Code reviews are performed and tracked through Pull Requests.
Here is a blog post on - Getting The most out of Pull Requests and Peer Reviews With Branch Policies
Comments