-
Notifications
You must be signed in to change notification settings - Fork 2
Flow model
This repository use a flow model similar to git flow and github flow
The two main branches are
- master this branch head is the latest released version of the code
- develop is the branche with the most advanced stable build
When contributing you should create a new branches using this format
-
feature/xfor adding a new feature to the game -
evo/xwhen improving, modifying or interring on an existing elements -
fix/xwhen fixing a bug -
refactor/xwhen refactoring code wherexis a name describing your branch
You can open a draft pull request at any time to track you progress. Only open the PR for review when you feel your branch is mergeable.
Ideally you should open your PR on develop or one of your branch if there is dependency. Before merging your branch verify that your base is the head of develop, rebase your branch otherwise on the head of develop before merging.
If you want to add a commit to someone's branch contact the owner of the branch first. Otherwise you can just open a new branch and add a commit to that branch. So that the owner of the branche can cherrypick you commit or proceed with a merge fast-forward.