Version Control Workflow - UO-DFM/SimCityOttawa-Documentation GitHub Wiki
Github Workflow
- Create a branch in the following format: SCO-###_ticket_name
- The source branch should be 'develop'
- "###" corresponds to the issue number for the branch
- Make a pull request into the 'develop' branch after you have made your necessary changes
- If the pull request has conflicts with develop, merge 'develop' into your branch
- Have one team member review the pull request
- Accept the pull request
- The pull request will be rebased and squashed
- 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