Home

Welcome to the DHIS 2 wiki pages.

Repository structure

The dhis2-core repository contains the following branches.

Master: The master represents the snapshot / latest development branch. Master receives commits through pull requests from feature branches and maintenance branches.

Create a branch for development work. Feature branches should be created for substantial features. Give the branch a descriptive name, e.g. soft-data-value-deletes. Maintenance branches should be created for minor tweaks and cleanup. Give the branch a name on the format {dev-name}-dhis2-core, e.g. lars-dhis2-core.
Do development work in the respective branch.
Publish your branch. This can be done by a) pushing your branch into the main dhis2-core branch or b) push it as a separate forked branch under the dhis2 github organization.
Open a pull request for your feature or fix. Provide the pull request with a descriptive message.
Ensure that tests are passing.
Optionally, request peer review of your pull request from another core developer.
Merge the pull request into master. For feature branches, do a squash merge, where a single commit is merged into master representing the entire feature. For maintenance branches you can potentially do an "expanded" commit where each individual commits are merged into master. In that case, ensure that each commit has a descriptive commit message.