Skip to content

Latest commit

 

History

History
36 lines (28 loc) · 1.98 KB

BRANCHING.md

File metadata and controls

36 lines (28 loc) · 1.98 KB
Raw

Branching Strategy

CSM 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.

Branch Naming Convention

Branch Type Example Comment
main main
Release release-1.0 hotfix: release-1.1 patch: release-1.0.1
Feature feature-9-olp-support "9" referring to GitHub issue ID
Bug Fix bugfix-110-remove-docker-compose "110" referring to GitHub issue ID

Steps for working on a release branch

  1. Fork the repository.
  2. Create a branch off of the main branch. The branch name should follow branch naming convention.
  3. Make your changes and commit them to your branch.
  4. If other code changes have merged into the upstream main branch, perform a rebase of those changes into your branch.
  5. Open a pull request between your branch and the upstream main branch.
  6. Once your pull request has merged, your branch can be deleted.