Development Branch

Overview

• name : dev
• branches from : master
• merges into: release

Description

This branch contains all changes that will be applied to the next release.

Receiving a Merge

Since the development branch is only a working version of the project, changes may be pushed from merges that took place in a developer's local repository or via a pull request.

Note: Changes to files should never occur directly in the development branch. These should all occur in a separate branch and then merged into development.

Merging will either originate from a feature branch or a maintenance branch.

If the merge originates from a feature branch, then it contains a new feature to be included in a future release.

If the merge originates from a maintenance branch, then it is applying a fix that cascades to all branches.

Sending to Release

Once development is considered production-ready, a release branch will be copied from development's current state. The definition of "production-ready" is determined on a case-by-case basis.