Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: describe expected branch workflow #1049

Merged
merged 4 commits into from
Jul 28, 2023
Merged

docs: describe expected branch workflow #1049

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bf7ed6
docs: describe expected branch workflow
rootulp Jul 26, 2023
9e01b05
note about non-breaking changes
rootulp Jul 27, 2023
f321c7a
Merge branch 'main' into rp/docs-branches
rootulp Jul 27, 2023
0f929cb
Merge branch 'main' into rp/docs-branches
rootulp Jul 28, 2023
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
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.
rootulp marked this conversation as resolved.
Show resolved Hide resolved

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
Loading