Skip to content

Commit

Permalink
Small update to the contributing doc (#54)
Browse files Browse the repository at this point in the history
* Update _index.md

* Update _index.md
  • Loading branch information
gallacher authored Nov 3, 2021
1 parent 8052eb8 commit a22ea31
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion content/docs/contributionguidelines/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ We use GitHub pull requests for this purpose.

### Branching strategy

CSM documentation portal follows a scaled trunk branching strategy where short-lived branches are created off of the main branch. When coding is complete, the branch is merged back into main after being approved in a pull request code review.
The CSM documentation portal follows a release branch strategy where a branch is created for each release and all documentation changes made for a release are done on that branch. The release branch is then merged into the main branch at the time of the release. In some situations it may be sufficient to merge a non-release branch to main if it fixes some issue in the documentation for the current released version.

#### Branch Naming Convention

Expand Down

0 comments on commit a22ea31

Please sign in to comment.