Content Comparison

...

If Blathers was unable to automatically create a backport PR, follow these steps after the main PR is merged to cherry-pick it into the release branch.

1. Make sure the backport tool is installed: go install github.com/benesch/backport@latest

   1. For first time setup, you will need to set the cockroach.remote git config option. Run git config cockroach.remote <myfork> where <myfork> is the remote in which your fork of cockroach is, e.g. origin. You might also need to add $GOPATH/bin to your $PATH.

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

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

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

   3. If something goes wrong, you can use backport --abort to give up on the current manual backport.

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). But note that if the backport has been open and unmerged for many days, CI results could be stale, and might not reflect the current state of the release branch. If the backport has been open and unmerged for many days, be sure to rebase the backport PR on the tip of the release branch before merging to get an up-to-date CI run.

...