Skip to content
vsergey3d edited this page Sep 21, 2014 · 3 revisions

Use rebase (not merge) to sync your branch from time to time.

Permanent branches

Develop is the main branch where the source code of HEAD always reflects a state with the latest delivered development changes.

Master is the main branch where the source code of HEAD always reflects a production-ready state. Each change to this branch should be tagged as new version v.MAJOR.MINOR.PATH.

Transient branches

Feature branches are used to develop new features. The essence of a feature branch is that it exists as long as the feature is in development, but will eventually be merged back or discarded.

Release branches support preparation of a new release. By doing some work on a release branch, the develop branch is cleared to receive changes.

Clone this wiki locally