Skip to content

Commit

Permalink
docs: describe expected branch workflow (#1049)
Browse files Browse the repository at this point in the history
I think this is the expected workflow now but defer to @cmwaters
  • Loading branch information
rootulp authored Jul 28, 2023
1 parent d97ea41 commit d02553f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ make proto-gen

The canonical branches in this repo are based on CometBFT releases. For example: [`v0.34.x-celestia`](https://github.com/celestiaorg/celestia-core/tree/v0.34.x-celestia) is based on the CometBFT `v0.34.x` release branch and contains Celestia-specific changes.

Usually PRs should target the `main` branch. After the PR merges to main, if the PR contained non-breaking changes, a maintainer may cherry-pick it to an existing release branch (e.g. [`v0.34.x-celestia`](https://github.com/celestiaorg/celestia-core/tree/v0.34.x-celestia)) and cut a new release.

## Versioning

Releases are formatted: `v<CELESTIA_CORE_VERSION>-tm-v<TENDERMINT_CORE_VERSION>`
Expand Down

0 comments on commit d02553f

Please sign in to comment.