Skip to content

Change branching strategy to trunk-based #11

@simskij

Description

@simskij

To simplify the workflow, we should change the branching strategy to trunk-based + short-lived feature branches instead of the current feature -> dev (and staging) -> master (and prod) approach.

The new branching strategy means that features will be merged directly to master, which in turn will be released in staging. Tagging a commit in master with a version number will release it to production. For instance:

master will be released to staging, but not feature/whatever.
v1.2.3 will be released to production, but not an-arbitrary-tag.

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions