|
|
|
@ -22,22 +22,20 @@ Always create a new branch for your task or feature. **Never commit directly to
|
|
|
|
|
|
|
|
|
|
**Branch Naming Convention:**
|
|
|
|
|
|
|
|
|
|
The Types of Branches we use are as follows:
|
|
|
|
|
|
|
|
|
|
#### Feature
|
|
|
|
|
Format: feature/name
|
|
|
|
|
* Feature
|
|
|
|
|
Format: feature/<name>
|
|
|
|
|
*Features will be used for adding new gameplay mechanics, UI updates, major changes.*
|
|
|
|
|
|
|
|
|
|
#### Bugfix
|
|
|
|
|
Format: bugfix/name
|
|
|
|
|
* Bugfix
|
|
|
|
|
Format: bugfix/<name>
|
|
|
|
|
*Bugfixes will be used for fixing bugs that don't appear to be game/project breaking, and may not have been noticed early.*
|
|
|
|
|
|
|
|
|
|
#### Hotfix
|
|
|
|
|
Format: hotfix/name
|
|
|
|
|
* Hotfix
|
|
|
|
|
Format: hotfix/<name>
|
|
|
|
|
*Hotfixes are for fixing issues that prevent features from functioning. For example, missing dependencies etc.*
|
|
|
|
|
|
|
|
|
|
#### Task
|
|
|
|
|
Format: task/name
|
|
|
|
|
* Task
|
|
|
|
|
Format: task/<name>
|
|
|
|
|
*Tasks are smaller updates. For example, adding a new static mesh, implementing an animation etc.*
|
|
|
|
|
|
|
|
|
|
When you're sure about the branch type, checkout the branch. As an example:
|
|
|
|
@ -95,8 +93,6 @@ We review all changes before they're merged into the main branch. This is to ens
|
|
|
|
|
|
|
|
|
|
**Branch Naming Convention:**
|
|
|
|
|
|
|
|
|
|
The Types of Branches we use are as follows:
|
|
|
|
|
|
|
|
|
|
* Feature
|
|
|
|
|
Format: feature/<name>
|
|
|
|
|
*Features will be used for adding new gameplay mechanics, UI updates, major changes.*
|
|
|
|
|