Branches (historical)
[ 1.1 Code Merges - late 2015 ] [ 2 Major Branches in late 2015 ]
Code Merges - late 2015
This diagram represents code flow/merges that occurred regularly late 2015, an accommodation of simultaneous projects with some dependencies. The regular, semi-automated merging between the Bitbucket and GitHub branches ceased in late 2015 to prep for an updated master branch in GitHub.
Gliffy Diagram is only supported by the cloud editor
Because Forge macros arent supported by the legacy editor, you'll need to convert this content to the cloud editor to display this macro properly. Find out more about converting to the cloud editorMajor Branches in late 2015
This diagram represents the major OpenLMIS-based branches and forks in the mid-to-late 2015 time frame, useful for understanding how the code was consolidated in 2.0. Smaller or transient branches have been omitted for clarity.
Gliffy Diagram is only supported by the cloud editor
Because Forge macros arent supported by the legacy editor, you'll need to convert this content to the cloud editor to display this macro properly. Find out more about converting to the cloud editor