The following is how our projects workflows are in place to help make development easy.
Our workflow consists of five types of branches, each with different roles:
BRANCH | EXAMPLE | ROLE |
---|---|---|
master |
- | Production Ready Code ( PR's from staging ) |
develop |
- | Code Deployed to Development Environment |
staging |
- | Code Deployed to Staging Environment ( PR's from develop ) |
feature/* |
feature/123-mobile-header |
Based on latest develop and Feature Specific |
fix/* |
fix/123-broken-form |
Based on latest develop and GitHub Issue Specific |
We're sorry things are not working as expected, and want to get things fixed ASAP. In order to help us do that, we need a few things from you.
- Create a New Issue
- Enter a Short but Descriptive Title for the Issue
- Use the Template Provided and fill in as much as you can, if something does not apply, enter
N/A
- Look for the
Labels
section, and selectBug Report
from the drop down menu - Click
Submit new issue
button
Got an idea for a new feature? We'd love to hear it! In order to get this knocked out, we will need a few things from you.
- Create a New Issue
- Enter a Short but Descriptive Title for the Feature Request
- Use the Template Provided and fill in as much as you can, if something does not apply, enter
N/A
( you can delete theSteps to Duplicate:
section as that does not apply ) - Look for the
Labels
section, and selectFeature Request
from the drop down menu - Click
Submit new issue
button
Each Bug Fix reported on GitHub should have its own
fix/*
branch. The branch name should be formattedfix/###-issue-name
where###
is the GitHub Issue Number, andissue-name
is a 1-3 word summary of the issue.
- Checkout latest
develop
branch - Pull down the latest changes via
git pull
- Create a new branch with the structure
fix/*
, e.g.fix/123-broken-form
- When you are ready to submit your code, submit a new Pull Request that merges your code into
develop
- Tag your new Pull Request with
Ready for Code Review
Each New Feature should reside in its own
feature/
branch. The branch name should be formattedfeature/###-feature-name
where###
is the GitHub Issue Number, andfeature-name
is a 1-3 word summary of the feature.
- Checkout latest
develop
branch - Pull down the latest changes via
git pull
- Create a new branch with the structure
feature/*
, e.g.feature/123-mobile-header
- When you are ready to submit your code, submit a new Pull Request that merges your code into
develop
- Tag your new Pull Request with
Ready for Code Review
We have three Environments, each set up with Continuous Integration and independent URLs for testing.
ENVIRONMENT | BRANCH |
---|---|
master |
|
staging |
|
develop |
- Production is deployed with any Pull Request that is merged into the
master
branch - Staging is deployed with any Pull Request that is merged into the
staging
branch - Development is deployed with any Pull Request that is merged into the
develop
branch