Git Flow and Review Process

Branching Strategy

• Master is current production code
• Develop is for integrating features
• Features are branched off Develop
  • Follow specific naming conventions
• Hot-Fixes are branched of Master
  • Master is then back-merged to Develop
• Releases are branched off develop
  • Tested in a staging/dev environment
  • Merged to Master

Example Diagram 

Pull Requests

• Developer should have tested their own code
• Documentation and unit tests should be written
• Pull requests for features should be into Develop
• Reviewers should:
  • Pull the branch locally
  • Test the feature
  • Test regular user workflow
• Commenting
  • Inconsistent style
  • Ambiguous code
  • Missed edge cases
  • Error handling issues
  • Indicate: blocking, suggestion, question

Approved

Only approve a Pull Request when any and all of your blocking comments have been addressed and you have tested locally.

Blocked

If local testing produced errors or unexpected behavior, or if you have any blocking comments that have not been addressed by the developer