Git Workflow - IntegratedBreedingPlatform/Documentation GitHub Wiki

All commits to the master branch are managed via a Feature Branch and Pull Request model :

https://bocoup.com/weblog/git-workflow-walkthrough-feature-branches

  • for each JIRA Epic, Enhancement or Bug ticket, a branch is created with the ticket number in the name
  • testing occurs in branch via branch deployment scripts running inside Jenkins
  • preliminary code review occurs
  • a Pull Request is created and formal Code Review occurs. This may include a demo if necessary.
  • Code is altered if needs be and then merged
  • Continuous Integration - build, unit test occurs
  • master branch can be deployed via script to Google Cloud VM fabric for testing via Jenkins

This is an honesty model rather than controlled branches - every developer commits to refrain from direct commits to the master branch. The Code Review is the person in a position to push the code, based on review, in branch testing and stability.