From d02553fdba2720f0314f2f6451a5d50b6755e62c Mon Sep 17 00:00:00 2001 From: Rootul P Date: Fri, 28 Jul 2023 09:04:52 -0400 Subject: [PATCH] docs: describe expected branch workflow (#1049) I think this is the expected workflow now but defer to @cmwaters --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fc56ca0c27..3a96dd06a5 100644 --- a/README.md +++ b/README.md @@ -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-tm-v`