BX GitFlow is the model of GitFlow that we use at Builbox. As part of our team you should understand such concepts so we can collaborate better. On this model, the repository has two main branches.
This is a highly stable branch that is always production-ready and contains the last release version of source code in production.
This is the main branch of development, and serves as a branch for integrating different features for an upcoming release.
Apart from these there are 4 other kind of branches.
These branches derives from the development branch and are used to implement new features.
To create a new feature branch, we use the corresponding Jira issue. Look for development section on the details of the issue and click on create branch.
After finishing a feature, you should create a pull request into development. The pull request must be reviewed by someone from your team. Pull requests can be made through some version control softwares, like GitKraken. On Bitbucket site, you just have to go to the pull request section.
Refer to these for more help.
- Sourcetree - Shortcut to pull request on Sourcetree
- GitKraken - Pull Requests on GitKraken
After the pull request is approved, someone on your team should integrate it into development. It will be usually a pre-defined person, so nothing to worry here.
When enough features have been developed. A release branch will be created. This branch is the one where tests will be made before going into production.
The bugs that the QA team identify for this release must be fixed here and integrated back into the development branch eventually.
This derives from the release branch and is used to fix bugs specific to tests.
This derives from the master branch and is used to fix a bug in the production that was identified after a release.
If you still have some doubts about the process you can ask your coworkers for help, or checkout these articles that were used as reference.