Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions docs/governance/policies/change-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,42 @@ The following branches SHOULD always be maintained:
- [ ] Each branch SHOULD represent a maximum of one [change proposa](#change-making-stages)l.
- [ ] Feature branches in the TIDES version control repository which have not been updated in 6 months MAY be archived.

Example branching actions shown below:

```mermaid
%%{init: { 'logLevel': 'debug', 'theme': 'base' } }%%
gitGraph:
commit tag: "v1.0.0"
branch develop
commit
branch spec-change-a
branch spec-change-b
checkout spec-change-a
commit id: "Add table"
commit id: "Add documentation for table"
checkout develop
merge spec-change-a tag: "v1.1-alpha.1"
checkout spec-change-b
commit id: "Add column"
commit id: "Add documentation for column"
checkout develop
merge spec-change-b tag: "v1.1-alpha.2"
commit id: "Update sample data"
checkout main
commit id: "Documentation update"
branch code-feature
commit id: "Add new test"
commit id: "Add documentation about test"
checkout main
merge code-feature
checkout develop
merge main id: "Update with changes to main" tag: "v1.1-beta.1"
commit id: "bugfix"
commit id: "Add changelog, documentation for release" tag: "v1.1-beta.2"
checkout main
merge develop tag: "v1.1"
```

## Attribution

**_This change management policy is adapted from:_**
Expand Down