-
Notifications
You must be signed in to change notification settings - Fork 1
Branches
Branching is based on the Git Flow model.
Use this branch to see the code tagged for release. Code from develop gets merged into this branch when it's stable enough for a new release.
The most recent development code. Developers should branch off from this branch when developing new features and create pull requests back to this branch to have new code merged in. You can pull from the head of this branch to sync up with the latest changes.
I'm going to try to keep to a naming convention for any branches I create, so it's easy to tell what's going on in a branch.
Based off of develop:
-
feature/: Feature branches by convention begin with this. One feature per branch as much as possible, so testing and debugging is easier. -
bugfix/: Just what it says. -
release/: Changes to code to prepare for release while development keeps going without affecting or being affected by the release changes.
Based off of master:
hotfix/-
support/: If changes in later versions need back-ported to older releases.
Most of this probably won't be used while basic functionality's being finished up. I just wanted to get my thoughts on naming conventions down so I don't make a mess later (or if I do, there's some method to the madness).