Version Control Workflow - UO-DFM/SimCityOttawa-Documentation GitHub Wiki

Github Workflow

  1. Create a branch in the following format: SCO-###_ticket_name
    1. The source branch should be 'develop'
    2. "###" corresponds to the issue number for the branch
  2. Make a pull request into the 'develop' branch after you have made your necessary changes
    1. If the pull request has conflicts with develop, merge 'develop' into your branch
  3. Have one team member review the pull request
  4. Accept the pull request
    1. The pull request will be rebased and squashed
  5. Delete the branch

develop vs. main

  • main is used for stable releases intended for public use
  • develop is used for stable development versions for testing or integration