Need to consolidate project branches

[Benjen]

Due to various external reasons this project has become somewhat fragmented due to different development paths. There are currently several git branches which are providing code to production sites. Summary of significant branches are as follows:

branch name	Notes
master	Previous used on the Betahealth site. Was added as a Git submodule until the HDS was converted to an NPM package.
feature/refactor_packages	Contains the Health Design System refactored as an NPM package. This contains version 1.4.0-alpha.5 of the npm package. This is the current package used on the Betahealth site.
feature/nst	Is a fork off the master branch containing a number of NST specific customisations.
feature/nst_npm_package	Combines feature/nst changes with feature/refactor_packages changes into the new feature/nst_npm_package branch. This is the most up-to-date branch but contains project specific changes which may be considered not appropriate for the HDS.

[Benjen]

The NST site currently is using a specific commit (22cd76) which at this time is the HEAD of the feature/nst_npm_package branch.

On option is the treat feature/nst_npm_package as the most recent production version of the Health Design System and merge this into master branch accordingly. After merging we should increment the npm package version to 1.4.0-alpha.6.

The NST project should be updated by replacing the currently deployed HDS commit (22cd76) with 1.4.0-alpha.6 npm package.

Given that Betahealth uses 1.4.0-alpha.5 version of HDS it should not be affected by these proposed changes.

Alternatively it could be argued that NST site level configuration changes do not belong in the Health Design System as they are project specific, where as the Health Design System should be applicable across all projects with project level customisations existing outside of the HDS (e.g. added at the sites theme layer). If this is the case do we want to include current NST changes in our main HDS development branch or should we treat is separately?

[dlm78]

Cheers for the comprehensive summary. Let's chat about this in our architecture session.