You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Mats Lundälv edited this page Nov 11, 2015
·
3 revisions
The main developer workflow was chosen to be simple yet supports continuous integration and deployment, including feature toggles. We use GitHub Flow with a branch naming convention. Thus also supports integration with Waffle.io Kanban. Scott Chacon's blog post gives insight into the use of GitHub flow Here's how we use it in Brian:
Anything in the master branch is deployable.
To work on something new, create a descriptively named branch off of master with a name that starts with the associate issue number first (eg: 50-new-feature).
Commit to that branch locally and regularly push your work to the same named branch on the server.
When you need feedback or help, or you think the branch is ready for merging, open a pull request using GitHub's "closes #50" syntax in the title.
After someone else has reviewed and signed off on the feature, you can merge it into master.
Once it is merged and pushed to ‘master’, you can and should deploy immediately.