Branching Strategy

Owned by Marc Dumontier
Last updated: Apr 03, 2017
1 min read

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.