Version Management

Git Branches and Commits

• Never commit anything directly to the develop branch (the branch is protected so no one can)
• Always rebase the branch on top of develop before merge
• We follow a single commit per branch rule.
• Before sending any PR, the developer should run all the unit tests locally.
• If the tests fail then PR will not be merged.
• Branch names should have a JIRA TICKET ID Prefix (e.g. MOB-0001) followed by an issue/ feature title (small case with hyphens).
  • MOB-0001-update-flutter-version
• Commit messages should have a JIRA TICKET ID Prefix (e.g. MOB-0001) followed by an issue/ feature title.
  • MOB-0001 Update flutter version

Code review

• Besides ensuring that the code is functioning correctly in code review, we also need to ensure it doesn’t affect the functionality of different regions (without being explicitly approved).
• Good things to do in code review
  • At least 1 reviewer from each region
  • Code is not merged until all the following steps are done
    • A. All the code reviewers have approved your code
      • If code changes are necessary, A. is repeated until everything is approved
    • B. Then a build is created and can be tested
      • If testing fails, new code changes are made and then A. is repeated
    • C. When testers approve the changes, the code can be merged