Branching Strategy
- Marc Dumontier
Owned by Marc Dumontier
This guide will describe the branching strategy used by OSCAR EMR for managing changes and releases.
Introduction
There are two permanent branches in OSCAR; master and stable. Also, temporary branches are created and closed to support Feature development and Release management.
Stable
For the purposes of this discussion, the root of everything is the 'stable' branch. Only tested changes should be merged to this branch. Changes can come in the form of a Hotfix or a Release branch.
Master
This branch is the latest development release. Changes come from Feature branches, Hotfixes and periodically release branches are created which are eventually merged into stable.
Related pages
How to Develop a Feature or Bug
How to Develop a Feature or Bug
Read with this
Building the code
Building the code
Read with this
Signing up for JIRA and Bitbucket
Signing up for JIRA and Bitbucket
Read with this
JIRA for OSCAR developers
JIRA for OSCAR developers
Read with this
Building 1 2 3
Building 1 2 3
Read with this