Branching model

We roughly follow the branching model explained here in more detail.

Branches

• master
• Used updated released and hotfixes
• develop
• Used for ongoing development
• make sure that the code remains stable on develop
• feature branches
• always based on develop and merged back into develop
• feature branches implement certain features and may break the code in between
• release branch
• based on develop, merged back into develop and master
• includes all preparations for a new release
• hot-fix branch
• based on master, merged back into master and develop
• Fix critical bugs after release

Important: Perform all merges without fast forward (add --no-ff option)

Conditions for merging feature branches into develop

1. Result of the test suit must be as good as or better than the result at the base of the feature branch.
2. Closure compilation (build with develop-min) runs through without error (only plenty of warnings)

Conditions for new release

1. Test for all new features in the test suite.
2. Examples for all new features in xml3d-examples