All development starts on the master branch.
In most cases, to add a commit to a patch release (or a beta/rc after a release branch has been created), you should submit a PR to master first and get it reviewed and merged there.
After the PR is merged to master, follow these steps to cherry-pick it into the release branch.
Make sure theÂ backport tool is installed:Â go get github.com/benesch/backport
For first time setup, you will need to set the cockroach.remote git config option. If your fork of cockroach is in the remote named origin, then set it with git config cockroach.remote origin while in your local cockroach git repo.
RunÂ backport -r VV.V xxxxx, where VV.V is replaced by the version number of the release branch and xxxxx is replaced by the GitHub PR number of the PR you are trying to backport, or a space-separated list of PR numbers.
This will automatically create a backport branch and upload it to your repository against the release branch to GitHub.
Then, it will try to open your browser to create a new PR with that branch, or provide instruction on how to do this manually if it cannot open your browser.
If there were merge conflicts,Â backport will halt and ask you to fix them. Once they're fixed, runÂ backport --continue to continue the procedure.
If there were any non-trivial merge conflicts, be sure to call those out in the PR message so reviewers can pay closer attention to the diff.
Note: You do not need to use bors to merge a backport PR; just hit the big green button once the CI is green and the backport is approved by the reviewer (usually the main reviewer of the original PR to master branch).