Skip to content

Repository workflow

Robert Jacob edited this page Sep 20, 2016 · 18 revisions

CIME uses a simplified version of the branching model described in gitworkflows(7), minus the pu (proposed updates) and next branches described there. All new features should start from master. Each feature is developed in a separate feature branch, allowing the individual features to be merged and improved independently. When a feature is ready for testing, it will be merged locally to master and developers should test the local merge. Once it is considered stable, the topic branch will be merged to master and tested in the nightly testing. In this model, master should be fairly stable.

CIME user a topic-branch, merge-based workflow.

All branches should start from master or a maintenance branch.

Clone this wiki locally