Everest Forms Git Flow

Table of Contents

• Branches
• Branch naming

For core development, we use the following structure and flow.

Branches

• Master is the branch for all development and should always be the target of pull requests.
• Each major release has a release branch e.g. release/1.0.
• Fixes are applied to master, and then cherry picked into the release branch if needed.
• Features that are not for the next release (for major, when next is minor) get labelled 'major' and are left as PRs. They can be approved however.
• Tags get created from release branches when ready to deploy.

Branch naming

Prefixes determine the type of branch, and include:

• fix/
• feature/
• add/
• update/
• release/

When creating a fix branch, use the correct prefix and the issue number. Example:

fix/12345

Alternatively you can summarise the change:

fix/form-entry-saving